@whyour/qinglong 2.17.8-beta → 2.17.8-beta.2

package/package.json

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

package/shell/otask.sh

@@ -71,8 +71,11 @@ run_nohup() {
 
 
 env_str_to_array() {
+  . $file_env
   local IFS="&"
   read -ra array <<<"${!env_param}"
+  array_length=${#array[@]}
+  clear_env
 }
 
 clear_non_sh_env() {
@@ -107,7 +110,7 @@ handle_env_split() {
   fi
 
   env_str_to_array
-  local tempArr=$(echo $num_param | sed "s/-max/-${#array[@]}/g" | sed "s/max-/${#array[@]}-/g" | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g")
+  local tempArr=$(echo $num_param | sed "s/-max/-${array_length}/g" | sed "s/max-/${array_length}-/g" | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g")
   local runArr=($(eval echo $tempArr))
   array_run=($(awk -v RS=' ' '!a[$1]++' <<<${runArr[@]}))
 }
@@ -213,11 +216,11 @@ main() {
     isJsOrPythonFile="true"
   fi
   if [[ -f $file_env ]]; then
+    get_env_array
     if [[ $isJsOrPythonFile == 'true' ]]; then
       export NODE_OPTIONS="${NODE_OPTIONS} -r ${preload_js_file}"
       export PYTHONPATH="${PYTHONPATH}:${dir_preload}"
     else
-      get_env_array
       . $file_env
     fi
   fi

package/shell/start.sh

@@ -27,6 +27,14 @@ if [[ ! $QL_DATA_DIR ]]; then
   exit 1
 fi
 
+command="$1"
+
+if [[ $command == "reload" ]]; then
+  mkdir -p /run/nginx
+  nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
+  exit 1
+fi
+
 # 安装依赖
 os_name=$(source /etc/os-release && echo "$ID")
 
@@ -92,6 +100,9 @@ if [[ $EnableExtraShell == true ]]; then
   echo -e "自定义脚本后台执行中...\n"
 fi
 
+pm2 startup
+pm2 save
+
 echo -e "############################################################\n"
 echo -e "启动完成..."
 echo -e "############################################################\n"