@wjwjq/release-helper 0.2.6 → 0.2.7

package/dist/deploy/script/common.sh

@@ -24,6 +24,13 @@ log_success() {
   echo "$now: [success] $1" >>"$execute_log_path"
 }
 
+log_warn() {
+  now=$(date "+%Y-%m-%d %H:%M:%S")
+  echo "$(tput setaf 3)""$now": "$1""$(tput sgr0)"
+  
+  echo "$now: [success] $1" >>"$execute_log_path"
+}
+
 log_error() {
   now=$(date "+%Y-%m-%d %H:%M:%S")
   echo "$(tput setaf 1)""$now": "$1" "$(tput sgr0)"
@@ -132,7 +139,31 @@ install_assets() {
 
 }
 
+now=$(date "+%Y-%m-%d_%H:%M:%S")
+time=$now
+old_version=$(get_old_version)
+
+backup(){
+  source_type=$1
+
+    #备份整个服务 eg: /opt/posidon-frontend
+  if [[ -n "${old_version}" ]]; then
+    backup_dir="$install_path"backup
+    mkdir -p $backup_dir
+
+    # 分开备份nginx 和assets
+    backup_path=$backup_dir"/"$old_version"_"$time
+    mkdir -p "$backup_path"
+
+    echo "${app_name} $source_type backup at: $backup_path"
+    mv "$install_path$source_type" "$backup_path"
+  fi
+}
+
+
 start() {
+  callBy=$1
+
   # 仅静态文件
   if [[ "${mode}" != 3 ]]; then
     # 未安装
@@ -168,29 +199,51 @@ start() {
 
   # 创建用户
   create_user_csri
-
-  now=$(date "+%Y-%m-%d_%H:%M:%S")
-  old_version=$(get_old_version)
-
-  #备份整个服务 eg: /opt/posidon-frontend
-  if [[ -n "${old_version}" ]]; then
-    parent_store_path=$(echo "$install_path" | sed -e "s/\/${app_name}//")
-    backup_path=$parent_store_path""$app_name"_"$old_version"_"$now
-    echo "${app_name} assets backup at: $backup_path"
-    mv "$install_path" "$backup_path"
-  fi
-
   mkdir -p "$install_path"
 
+
   # 仅静态文件
   if [[ "${mode}" != 3 ]]; then
-    copy_nginx_conf_and_write_verison
-    add_nginx_service
-    add_log_rotate
+    if [ -f "${nginx_conf_path}" ]; then
+     while true; do
+      read -r -p "nginx.conf file already exists, update it?[Y/N]" yn
+      case $yn in
+      [Yy]*)
+        # 备份nginx配置目录
+        backup nginx;
+
+        copy_nginx_conf_and_write_verison
+        add_nginx_service
+        add_log_rotate
+        
+        if [[ $? != 0 ]]; then
+          echo "$(tput setaf 1)"failed to update nginx.conf!"$(tput sgr0)"
+          exit 1
+        else
+          log_warn "!!!!!!!!!nginx.conf has been updated, please note the changes, such as port 5443 !!!!!!!!!!"
+        fi
+        break
+        ;;
+      [Nn]*) break ;;
+      *) echo "Please answer yes or no." ;;
+      esac
+      done
+    else
+      copy_nginx_conf_and_write_verison
+      add_nginx_service
+      add_log_rotate
+    fi
   fi
 
+  # 备份静态资源目录
+  backup assets;
+
   install_assets
 
+  # 修改/etc/nginx 用户(组)
+  chown -R $user:$usergroup "$nginx_binary_install_path"
+  chmod 744 -R "$nginx_binary_install_path"
+
   # 修改所属用户
   chown -R $user:$usergroup "$install_path"
   chmod 744 -R "$install_path"

package/dist/deploy/script/install.sh

@@ -4,4 +4,4 @@ basepath=$(dirname "$(realpath "${BASH_SOURCE[-1]}")")
 
 source "$basepath"/common.sh
 
-start
+start 'install'

package/dist/deploy/script/nginx.sh

@@ -314,8 +314,6 @@ install_nginx_binary() {
   ln -sf "$nginx_binary_install_path"sbin/nginx /usr/sbin/nginx
   # cd ..
 
-  # 修改/etc/nginx 用户(组)
-  chown -R $user:$usergroup "$nginx_binary_install_path"
-  chmod 744 -R "$nginx_binary_install_path"
+
 }
 #------------------------------------ nginx 可执行程序相关 end ----------------------------------

package/dist/deploy/script/upgrade.sh

@@ -4,4 +4,4 @@ basepath=$(dirname "$(realpath "${BASH_SOURCE[-1]}")")
 
 source "$basepath"/common.sh
 
-start
+start 'upgrade'

package/package.json

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