@wjwjq/release-helper 0.2.94 → 0.2.96

package/dist/deploy/script/common.sh

@@ -42,10 +42,6 @@ log "-----------execute ${app_name} script-------------"
 
 source "$basepath"/prompt.sh
 
-if [[ $(whoami) != "root" ]]; then
-  echo "user:root is required!"
-  exit 1
-fi
 
 if [[ -z "${install_path}" ]]; then
   echo "install path not found"
@@ -156,11 +152,13 @@ backup(){
     backup_path=$backup_dir"/"$old_version"_"$time
     mkdir -p "$backup_path"
 
-    echo "${app_name} $source_type backup at: $backup_path"
+    echo "${app_name} $source_type backup at: $backup_path" >&2
     mv "$install_path$source_type" "$backup_path"
+
+    echo "$backup_path/$source_type"
   fi
 }
-
+ 
 
 start() {
   callBy=$1
@@ -237,10 +235,18 @@ start() {
   fi
 
   # 备份静态资源目录
-  backup assets;
+  backup_dir=$(backup assets);
 
   install_assets
 
+  # 执行after.sh 脚本
+
+  # 如果backup_dir 不为空，且after.sh 脚本存在，则执行after.sh 脚本
+  if [[ -n "$backup_dir" && -f "$basepath/after.sh" ]]; then
+    source "$basepath/after.sh"
+    execute $backup_dir  $install_path/assets  $install_path
+  fi
+
   # 修改/etc/nginx 用户(组)
   chown -R $user:$usergroup "$nginx_binary_install_path"
   chmod 744 -R "$nginx_binary_install_path"

package/dist/deploy/script/nginx.sh

@@ -295,12 +295,12 @@ install_nginx_from_source(){
   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 
+    --with-stream \
+    --prefix=${nginx_binary_install_path}
 
   make && make install
   # 检测是否安装成功

package/dist/pack.js

@@ -5,6 +5,7 @@ import pc from 'picocolors';
 import * as tar from 'tar';
 import { checkEnvInfo, __work_dir, __releaseDir, __dirname, releaseConf } from './prepare.js';
 import { logger } from './logger.js';
+import { sleep } from './utils.js';
 import 'yaml';
 import 'execa';
 import 'node:url';
@@ -34,6 +35,7 @@ async function pack(version) {
     const projectDir = resolve(__releaseDir, projectName);
     const assetsDir = resolve(projectDir, "pkg/assets");
     const nginxDir = resolve(projectDir, "pkg/nginx");
+    const scriptDir = resolve(projectDir, "script");
     fs.cpSync(resolve(__dirname, "deploy"), projectDir, { recursive: true });
     fs.cpSync(resolve(__work_dir, releaseConf.assetsDir), assetsDir, { recursive: true });
     fs.writeFileSync(resolve(projectDir, "pkg", "version"), version, { encoding: "utf-8" });
@@ -79,13 +81,16 @@ async function pack(version) {
       replaced: [["__root__", `${assetInstallPath}assets/`]]
       // writeToNewFilePath: resolve(nginxDir, `${projectName}.conf`)
     });
+    if (fs.existsSync(resolve(__releaseDir, "script", "after.sh"))) {
+      fs.copyFileSync(resolve(__releaseDir, "script", "after.sh"), resolve(scriptDir, "after.sh"));
+    }
     logger.info(pc.green(`start to generate ${zipFileName}`));
     const zipFilePath = resolve(__releaseDir, zipFileName);
     await genTarPkg(__releaseDir, projectName, zipFilePath);
     logger.success(`done to pack ${pc.green(`${zipFileName} at: ${__releaseDir}`)}`);
-    await new Promise((resolve2) => setTimeout(resolve2, 1e3));
+    await sleep(1e3);
     if (fs.existsSync(projectDir)) {
-      fs.rmSync(projectDir, { recursive: true, force: true });
+      fs.rmSync(projectDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 1e3 });
     }
     return {
       version,

package/dist/publish.js

@@ -9,6 +9,7 @@ import { Gitlab } from '@gitbeaker/rest';
 import { releaseConf, __releaseDir } from './prepare.js';
 import { logger } from './logger.js';
 import { execa, $ } from 'execa';
+import { sleep } from './utils.js';
 import 'yaml';
 import 'picocolors';
 
@@ -231,7 +232,8 @@ async function publish(params) {
     await api.ReleaseLinks.create(id, version, pkgName, `${host}${tarUploads.full_path}`, { linkType: "package" });
     await api.ReleaseLinks.create(id, version, md5FileName, `${host}${md5Uploads.full_path}`, { linkType: "other" });
     await Promise.all(docUploads.map((doc) => api.ReleaseLinks.create(id, version, doc.alt, `${host}${doc.full_path}`, { linkType: "other" })));
-    fs.unlinkSync(assetFile);
+    await sleep(1e3);
+    fs.rmSync(assetFile, { force: true, maxRetries: 3, retryDelay: 1e3 });
     logger.success(`Successfully released at: ${res._links.self} `);
   } catch (error) {
     logger.error("\u{1F680} ~ file: publish.js ~ error:");

package/dist/release.js

@@ -9,6 +9,7 @@ import { logger } from './logger.js';
 import 'node:fs';
 import 'node:path';
 import 'tar';
+import './utils.js';
 import 'node:url';
 import 'node:crypto';
 import 'mime';

package/dist/utils.js

@@ -0,0 +1,5 @@
+function sleep(ms = 1e3) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+export { sleep };

package/package.json

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