@wjwjq/release-helper 0.1.9 → 0.2.1

package/dist/deploy/script/nginx.sh

@@ -208,6 +208,32 @@ open_port_80() {
   firewall-cmd --reload
 }
 
+function check_dependency(){
+  if [[ -z $(rpm -qa | grep ^gcc | grep -v grep) ]];
+  then
+    cd ${nginx_binary_pkg_path}/gcc && rpm -Uvh *.rpm --nodeps --force 
+  fi
+  if [[ -z $(rpm -qa | grep ^gcc-c++ | grep -v grep) ]];
+  then
+    cd ${nginx_binary_pkg_path}/g++ && rpm -Uvh *.rpm --nodeps --force 
+  fi
+  if [[ -z $(rpm -qa | grep ^zlib-devel | grep -v grep) ]];
+  then
+    cd ${nginx_binary_pkg_path}/zlib && rpm -Uvh *.rpm --nodeps --force 
+  fi
+  if [[ -z $(rpm -qa | grep ^openssl-devel | grep -v grep) ]];
+  then
+    cd ${nginx_binary_pkg_path}/openssl && rpm -Uvh *.rpm --nodeps --force 
+  fi
+  if [[ -z $(rpm -qa | grep ^pcre-devel | grep -v grep) ]];
+  then
+    cd ${nginx_binary_pkg_path}/pcre && rpm -Uvh *.rpm --nodeps --force 
+  fi
+
+  cd $project_path/script
+}
+ 
+
 # 安装nginx可执行程序
 install_nginx_binary() {
   log "install nginx to path: ${nginx_binary_install_path}"
@@ -215,40 +241,66 @@ install_nginx_binary() {
   arch=$(uname -m)
   ssl_version=$(openssl version | grep -oP '\d+\.\d+' | sed -n '1p' 2>&1)
 
-  if [[ -z "${arch}" ]]; then
-    arch="x86_64"
-  fi
+  # if [[ -z "${arch}" ]]; then
+  #   arch="x86_64"
+  # fi
 
-  if [[ $arch == arm* ]] || [[ $arch = aarch64 ]]; then
-    arch="arm"
-  fi
+  # if [[ $arch == arm* ]] || [[ $arch = aarch64 ]]; then
+  #   arch="arm"
+  # fi
 
-  if [[ "${ssl_version}" == "1.0" ]]; then
-    ssl_version="1.0.2"
-  fi
+  # if [[ "${ssl_version}" == "1.0" ]]; then
+  #   ssl_version="1.0.2"
+  # fi
 
-  if [[ "${ssl_version}" == "1.1" ]]; then
-    ssl_version="1.1.1"
-  fi
+  # if [[ "${ssl_version}" == "1.1" ]]; then
+  #   ssl_version="1.1.1"
+  # fi
 
-  if [[ "${ssl_version}" == "3.0" ]]; then
-    ssl_version="3.0.7"
-  fi
+  # if [[ "${ssl_version}" == "3.0" ]]; then
+  #   ssl_version="3.0.7"
+  # fi
 
-  if [[ -z "${ssl_version}" ]]; then
-    ssl_version="1.0.2"
-  fi
+  # if [[ -z "${ssl_version}" ]]; then
+  #   ssl_version="1.0.2"
+  # fi
 
-  pkg="$nginx_binary_pkg_path"/nginx-"$arch"-ssl"$ssl_version".tar.gz
+  # pkg="$nginx_binary_pkg_path"/nginx-"$arch"-ssl"$ssl_version".tar.gz
 
-  if [ ! -f "$pkg" ]; then
-    log_error "Fatal error: nginx-$arch-ssl$ssl_version.tar.gz not matched!  contact developer!"
-    exit 1
-  fi
+  # if [ ! -f "$pkg" ]; then
+  #   log_error "Fatal error: nginx-$arch-ssl$ssl_version.tar.gz not matched!  contact developer!"
+  #   exit 1
+  # fi
+
+  # log "current arch: $arch, current ssl_version： $ssl_version"
 
-  log "current arch: $arch, current ssl_version： $ssl_version"
+  # tar -zxvhf "$pkg" -C "$nginx_binary_install_path" --strip-components 1
 
-  tar -zxvhf "$pkg" -C "$nginx_binary_install_path" --strip-components 1
+
+  check_dependency
+  # 检测是否安装成功
+  if [[ $? == 0 ]]; then
+    log_success "dependency installation successfully!"
+  else
+    log_error "dependency installation failed!"
+  fi
+  
+  log "start to complie and install nginx"
+
+  tar_name=$(ls ${nginx_binary_pkg_path}|grep nginx-.*.tar.gz)
+  tar_dir=${tar_name%.tar.gz*}
+  tar -zxvf "${nginx_binary_pkg_path}"/"${tar_name}"
+  cd "${tar_dir}"
+
+  ./configure \
+    --prefix=${nginx_binary_install_path} \
+    --with-http_ssl_module \
+    --with-http_v2_module \
+    --with-http_gzip_static_module \
+    --with-http_stub_status_module \
+    --with-stream 
+
+  make && make install
   # 检测是否安装成功
   if [[ $? == 0 ]]; then
     log_success "nginx installation successfully!"
@@ -256,7 +308,11 @@ install_nginx_binary() {
     log_error "nginx installation failed!"
   fi
 
+  cp $nginx_binary_install_path/conf/mime.types $nginx_binary_install_path
+
+  mkdir -p /usr/local/bin
   ln -sf "$nginx_binary_install_path"sbin/nginx /usr/sbin/nginx
+  cd ..
 
   # 修改/etc/nginx 用户(组)
   chown -R $user:$usergroup "$nginx_binary_install_path"

package/dist/prepare.js

@@ -61,7 +61,7 @@ async function prepare({ callBy } = { callBy: "postinstall" }) {
   }
 }
 async function checkEnvInfo() {
-  const { stdout: isGitRepo } = await $(`git rev-parse --is-inside-work-tree`);
+  const { stdout: isGitRepo } = await $`git rev-parse --is-inside-work-tree`;
   if (isGitRepo !== "true") {
     logger.error("\u5F53\u524D\u9879\u76EE\u4E0D\u662Fgit\u4ED3\u5E93");
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wjwjq/release-helper",
-  "version": "0.1.9",
+  "version": "0.2.1",
   "description": "generate deployment package for frontend, include nginx...",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -63,8 +63,10 @@
     "node": "^18.20.0 || >=20.0.0"
   },
   "scripts": {
-    "localpack": "pnpm build && pnpm link --global",
+    "local": "pnpm build && pnpm link --global",
     "postinstall": "node dist/start_prepare.js",
+    "test:pak": "pnpm build & node ./bin/index.js pack",
+    "test:release": "pnpm build & node ./bin/index.js release",
     "build": "rm -rf dist && rollup -c",
     "prepublish": "pnpm build"
   }

package/.release/README.md

@@ -1,73 +0,0 @@
-# release-helper
-
-打包 和发布辅助工具, 集成nginx二进制文件，支持supervisor和systemctl启动安装模式
-
-服务器端安装和更新，请看发布后文档
-
-## 使用
-
-### 推荐
-
-在package.json中添加如下命令, 后续通过pnpm pak/pub/publish使用
-
-```bash
-  "pak": "release-helper pack",
-  "pub": "release-helper publish",
-  "release": "release-helper release",
-```
-
-### 单独使用命令
-
-请在项目根目录，使用命令
-
-#### 初始化
-
-常规来讲，通过pnpm安装时，会自动在项目根目录位置，生成.release目录，若未生成，请手动生成
-
-```bash
-release-helper init
-```
-
-#### 打包
-
-仅打包成xx.tar.gz  需指定release.conf.yaml中assetsDir字段
-
-```bash
-release-helper pack
-```
-
-#### 发版
-
-发布git release相关版本； 需指定release.conf.yaml中host等相关字段
-
-```bash
-release-helper release
-```
-
-## .release 目录说明
-
-### doc 目录
-
-用于release时附带的文档，文档中可以使用指定变量占位，后续执行release-helper release时会自动遍历，并替换所有变量
-
-可使用变量及说明:
-
-| **占位符**    | **含义**                                             |
-| ------------- | ---------------------------------------------------- |
-| \$APP\_NAME\$ | 应用名称（自动读取package.json中name字段值）         |
-| \$VERSION\$   | 用户指定的版本号                                     |
-| \$PKG_NAME\$  | tar.gz包名称（值为\$APP_NAME\$\_\$VERSION\$.tar.gz） |
-
-### nginx 目录
-
-用于存放服务器端nginx的启动配置文件等，部分占位说明及占位符请勿删除，会在服务器端安装或更新时，由脚本自动替换
-
-文件说明：
-| **文件或目录** | **说明**                                                  |
-| -------------- | --------------------------------------------------------- |
-| ca             | nginx https使用到的证书，变更时需对应修改nginx.conf中的值 |
-| nginx.conf     | nginx启动时 需要的配置文件                                |
-
-### release.conf.yaml
-
-打包发布相关配置项