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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/shell/otask.sh +5 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@whyour/qinglong",
3
- "version": "2.17.8-beta",
3
+ "version": "2.17.8-beta.1",
4
4
  "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
5
5
  "repository": {
6
6
  "type": "git",
package/shell/otask.sh CHANGED
@@ -71,8 +71,11 @@ run_nohup() {
71
71
 
72
72
 
73
73
  env_str_to_array() {
74
+ . $file_env
74
75
  local IFS="&"
75
76
  read -ra array <<<"${!env_param}"
77
+ array_length=${#array[@]}
78
+ clear_env
76
79
  }
77
80
 
78
81
  clear_non_sh_env() {
@@ -107,7 +110,7 @@ handle_env_split() {
107
110
  fi
108
111
 
109
112
  env_str_to_array
110
- local tempArr=$(echo $num_param | sed "s/-max/-${#array[@]}/g" | sed "s/max-/${#array[@]}-/g" | perl -pe "s|(\d+)(-\|~\|_)(\d+)|{\1..\3}|g")
113
+ 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")
111
114
  local runArr=($(eval echo $tempArr))
112
115
  array_run=($(awk -v RS=' ' '!a[$1]++' <<<${runArr[@]}))
113
116
  }
@@ -213,11 +216,11 @@ main() {
213
216
  isJsOrPythonFile="true"
214
217
  fi
215
218
  if [[ -f $file_env ]]; then
219
+ get_env_array
216
220
  if [[ $isJsOrPythonFile == 'true' ]]; then
217
221
  export NODE_OPTIONS="${NODE_OPTIONS} -r ${preload_js_file}"
218
222
  export PYTHONPATH="${PYTHONPATH}:${dir_preload}"
219
223
  else
220
- get_env_array
221
224
  . $file_env
222
225
  fi
223
226
  fi