@whyour/qinglong 0.20.3 → 0.20.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyour/qinglong",
-  "version": "0.20.3",
+  "version": "0.20.4",
   "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
   "repository": {
     "type": "git",

package/shell/share.sh

@@ -6,7 +6,7 @@ dir_tmp=$dir_root/.tmp
 dir_data=$dir_root/data
 
 if [[ $QL_DATA_DIR ]]; then
-  dir_data=$QL_DATA_DIR
+  dir_data="${QL_DATA_DIR%/}"
 fi
 
 dir_shell=$dir_root/shell
@@ -376,25 +376,25 @@ patch_version() {
 
   if [[ -d "$dir_root/db" ]]; then
     echo -e "检测到旧的db目录，拷贝到data目录...\n"
-    cp -rf $dir_root/config $dir_root/data
+    cp -rf $dir_root/config $dir_data
     echo
   fi
 
   if [[ -d "$dir_root/scripts" ]]; then
     echo -e "检测到旧的scripts目录，拷贝到data目录...\n"
-    cp -rf $dir_root/scripts $dir_root/data
+    cp -rf $dir_root/scripts $dir_data
     echo
   fi
 
   if [[ -d "$dir_root/log" ]]; then
     echo -e "检测到旧的log目录，拷贝到data目录...\n"
-    cp -rf $dir_root/log $dir_root/data
+    cp -rf $dir_root/log $dir_data
     echo
   fi
 
   if [[ -d "$dir_root/config" ]]; then
     echo -e "检测到旧的config目录，拷贝到data目录...\n"
-    cp -rf $dir_root/config $dir_root/data
+    cp -rf $dir_root/config $dir_data
     echo
   fi
 }

package/shell/update.sh

@@ -242,8 +242,8 @@ reload_qinglong() {
   fi
 
   if [[ "$reload_target" == 'data' ]]; then
-    rm -rf ${dir_root}/data/*
-    mv -f ${dir_tmp}/data/* ${dir_root}/data/
+    rm -rf ${dir_data}/*
+    mv -f ${dir_tmp}/data/* ${dir_data}/
   fi
 
   reload_pm2

package/static/build/config/index.js

@@ -20,11 +20,11 @@ const lastVersionFile = `https://qn.whyour.cn/version.yaml`;
 const rootPath = process.env.QL_DIR;
 const envFound = dotenv_1.default.config({ path: path_1.default.join(rootPath, '.env') });
 let dataPath = path_1.default.join(rootPath, 'data/');
-const shellPath = path_1.default.join(rootPath, 'shell/');
-const tmpPath = path_1.default.join(rootPath, '.tmp/');
 if (process.env.QL_DATA_DIR) {
-    dataPath = process.env.QL_DATA_DIR;
+    dataPath = process.env.QL_DATA_DIR.replace(/\/$/g, '');
 }
+const shellPath = path_1.default.join(rootPath, 'shell/');
+const tmpPath = path_1.default.join(rootPath, '.tmp/');
 const samplePath = path_1.default.join(rootPath, 'sample/');
 const configPath = path_1.default.join(dataPath, 'config/');
 const scriptPath = path_1.default.join(dataPath, 'scripts/');

package/static/build/loaders/initData.js

@@ -113,17 +113,17 @@ exports.default = async () => {
                 }
                 if (doc.command.includes(`${config_1.default.rootPath}/log/`)) {
                     await cron_1.CrontabModel.update({
-                        command: `${config_1.default.rootPath}/data/log/${doc.command.replace(`${config_1.default.rootPath}/log/`, '')}`,
+                        command: `${config_1.default.dataPath}/log/${doc.command.replace(`${config_1.default.rootPath}/log/`, '')}`,
                     }, { where: { id: doc.id } });
                 }
                 if (doc.command.includes(`${config_1.default.rootPath}/config/`)) {
                     await cron_1.CrontabModel.update({
-                        command: `${config_1.default.rootPath}/data/config/${doc.command.replace(`${config_1.default.rootPath}/config/`, '')}`,
+                        command: `${config_1.default.dataPath}/config/${doc.command.replace(`${config_1.default.rootPath}/config/`, '')}`,
                     }, { where: { id: doc.id } });
                 }
                 if (doc.command.includes(`${config_1.default.rootPath}/db/`)) {
                     await cron_1.CrontabModel.update({
-                        command: `${config_1.default.rootPath}/data/db/${doc.command.replace(`${config_1.default.rootPath}/db/`, '')}`,
+                        command: `${config_1.default.dataPath}/db/${doc.command.replace(`${config_1.default.rootPath}/db/`, '')}`,
                     }, { where: { id: doc.id } });
                 }
             }

package/static/build/loaders/initFile.js

@@ -11,7 +11,7 @@ const util_1 = require("../config/util");
 const rootPath = process.env.QL_DIR;
 let dataPath = path_1.default.join(rootPath, 'data/');
 if (process.env.QL_DATA_DIR) {
-    dataPath = process.env.QL_DATA_DIR;
+    dataPath = process.env.QL_DATA_DIR.replace(/\/$/g, '');
 }
 const configPath = path_1.default.join(dataPath, 'config/');
 const scriptPath = path_1.default.join(dataPath, 'scripts/');