@wjwjq/release-helper 0.2.0 → 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/package.json

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

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

@@ -1,39 +0,0 @@
-#!/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--------------"