@wjwjq/release-helper 0.2.4 → 0.2.6

package/dist/deploy/pkg/nginx_binary/compile.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+# current nginx source code version 1.22.1
+
+./configure \
+  --prefix=/etc/nginx \
+  --conf-path=/etc/nginx/nginx.conf \
+  --error-log-path=/var/log/nginx/error.log \
+  --http-log-path=/var/log/nginx/access.log \
+  --pid-path=/var/run/nginx.pid \
+  --lock-path=/var/run/nginx/nginx.lock \
+  --with-http_ssl_module \
+  --with-http_v2_module \
+  --with-http_gzip_static_module \
+  --with-http_stub_status_module \
+  --with-stream \
+  --with-pcre
+
+make
+
+make install
+
+echo '------------------compile and install done----------------------------'
+
+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 "${ssl_version}" ]]; then
+  ssl_version="1.0.2"
+fi
+
+cd /etc || exit
+
+tar -zcvf nginx-"$arch"-ssl"$ssl_version".tar.gz nginx/ -C /root
+
+echo "-----------pack at: /root  nginx-"$arch"-ssl"$ssl_version".tar.gz--------------"

package/dist/deploy/script/nginx.sh

@@ -241,66 +241,65 @@ 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 [[ $arch == arm* ]] || [[ $arch = aarch64 ]]; then
-  #   arch="arm"
-  # fi
+  if [[ -z "${arch}" ]]; then
+    arch="x86_64"
+  fi
 
-  # if [[ "${ssl_version}" == "1.0" ]]; then
-  #   ssl_version="1.0.2"
-  # fi
+  if [[ $arch == arm* ]] || [[ $arch = aarch64 ]]; then
+    arch="arm"
+  fi
 
-  # if [[ "${ssl_version}" == "1.1" ]]; then
-  #   ssl_version="1.1.1"
-  # fi
+  if [[ "${ssl_version}" == "1.0" ]]; then
+    ssl_version="1.0.2"
+  fi
 
-  # if [[ "${ssl_version}" == "3.0" ]]; then
-  #   ssl_version="3.0.7"
-  # fi
+  if [[ "${ssl_version}" == "1.1" ]]; then
+    ssl_version="1.1.1"
+  fi
 
-  # if [[ -z "${ssl_version}" ]]; then
-  #   ssl_version="1.0.2"
-  # fi
+  if [[ "${ssl_version}" == "3.0" ]]; then
+    ssl_version="3.0.7"
+  fi
 
-  # pkg="$nginx_binary_pkg_path"/nginx-"$arch"-ssl"$ssl_version".tar.gz
+  if [[ -z "${ssl_version}" ]]; then
+    ssl_version="1.0.2"
+  fi
 
-  # if [ ! -f "$pkg" ]; then
-  #   log_error "Fatal error: nginx-$arch-ssl$ssl_version.tar.gz not matched!  contact developer!"
-  #   exit 1
-  # fi
+  pkg="$nginx_binary_pkg_path"/nginx-"$arch"-ssl"$ssl_version".tar.gz
 
-  # log "current arch: $arch, current ssl_version： $ssl_version"
+  if [ ! -f "$pkg" ]; then
+    log_error "Fatal error: nginx-$arch-ssl$ssl_version.tar.gz not matched!  contact developer!"
+    exit 1
+  fi
 
-  # tar -zxvhf "$pkg" -C "$nginx_binary_install_path" --strip-components 1
+  log "current arch: $arch, current ssl_version： $ssl_version"
 
+  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
+  # 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
+  # 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!"
@@ -308,11 +307,12 @@ install_nginx_binary() {
     log_error "nginx installation failed!"
   fi
 
-  cp $nginx_binary_install_path/conf/mime.types $nginx_binary_install_path
+  # cp $nginx_binary_install_path/conf/mime.types $nginx_binary_install_path
 
   mkdir -p /usr/local/bin
+  mkdir -p /var/log/nginx
   ln -sf "$nginx_binary_install_path"sbin/nginx /usr/sbin/nginx
-  cd ..
+  # cd ..
 
   # 修改/etc/nginx 用户(组)
   chown -R $user:$usergroup "$nginx_binary_install_path"

package/dist/publish.js

@@ -139,14 +139,15 @@ async function getGitTags() {
 }
 async function selectLatestTag(targetVersion) {
   let latestTag = "";
-  const tags = await getGitTags();
+  let tags = await getGitTags();
+  tags = tags.filter((item) => item !== targetVersion);
   if (tags.length >= 2) {
     const ac = new AbortController();
     const prompt = inquirer.select(
       {
         message: "\u8BF7\u9009\u62E9\u53D1\u5E03\u4FE1\u606F\u4ECE\u54EA\u6B21tag\u5F00\u59CB\u751F\u6210\uFF0C\uFF08\u9ED8\u8BA4\uFF1A \u6700\u8FD1\u4E00\u6B21\uFF0C\u7279\u522B\u9488\u5BF9\u67D0\u4E3B\u7248\u672C\u4E4B\u95F4\u6709\u5C0F\u7248\u672C\u8FC7\u6E21\u7684\u60C5\u51B5\uFF09(timing out in 10 seconds)\uFF1A",
         default: tags[0],
-        choices: tags.filter((item) => item !== targetVersion).map((tag) => ({ value: tag }))
+        choices: tags.map((tag) => ({ value: tag }))
       }
     );
     prompt.finally(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wjwjq/release-helper",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "generate deployment package for frontend, include nginx...",
   "main": "dist/index.js",
   "module": "dist/index.js",