open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2025-07-27 14:46:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复task命令参数引入

Browse Source
This commit is contained in:
whyour 2021-05-04 13:17:08 +08:00
parent 082acc2fb5
commit 34775dd14d
4 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shell/code.sh
View File

@ -5,7 +5,7 @@ dir_shell=/ql/shell
. $dir_shell/share.sh . $dir_shell/share.sh
## 导入配置文件 ## 导入配置文件
import_config_and_check import_config
## 生成pt_pin清单 ## 生成pt_pin清单
gen_pt_pin_array () { gen_pt_pin_array () {

2
shell/rmlog.sh
View File

@ -5,7 +5,7 @@ dir_shell=/ql/shell
. $dir_shell/share.sh . $dir_shell/share.sh
## 导入配置文件 ## 导入配置文件
import_config_no_check rmlog import_config
days=$1 days=$1

16
shell/share.sh
View File

@ -45,25 +45,15 @@ original_name=(
notify.sh notify.sh
) )
## 导入配置文件不校验 ## 导入配置文件
import_config_no_check () { import_config () {
[ -f $file_cookie ] && . $file_cookie [ -f $file_cookie ] && . $file_cookie
[ -f $file_config_user ] && . $file_config_user [ -f $file_config_user ] && . $file_config_user
}
## 导入配置文件并校验
import_config_and_check () {
import_config_no_check
if [[ ! -s $file_cookie ]]; then
echo -e "请先配置好Cookie...\n"
exit 1
else
user_sum=0 user_sum=0
for line in $(cat $file_cookie); do for line in $(cat $file_cookie); do
let user_sum++ let user_sum++
eval Cookie${user_sum}="\"$line\"" eval Cookie${user_sum}="\"$line\""
done done
fi
} }
## 创建目录，$1：目录的绝对路径 ## 创建目录，$1：目录的绝对路径
@ -261,4 +251,4 @@ detect_termux
detect_macos detect_macos
define_cmd define_cmd
fix_config fix_config
import_config_no_check import_config

10
shell/task.sh
View File

@ -41,7 +41,7 @@ define_program () {
elif [[ $p1 == *.py ]]; then elif [[ $p1 == *.py ]]; then
which_program="python3" which_program="python3"
else else
which_program="bash" which_program=""
fi fi
} }
@ -59,7 +59,7 @@ random_delay () {
## scripts目录下所有可运行脚本数组 ## scripts目录下所有可运行脚本数组
gen_array_scripts () { gen_array_scripts () {
import_config_no_check import_config
local dir_current=$(pwd) local dir_current=$(pwd)
local i="-1" local i="-1"
cd $dir_scripts cd $dir_scripts
@ -98,7 +98,7 @@ run_nohup () {
run_normal () { run_normal () {
local p1=$1 local p1=$1
cd $dir_scripts cd $dir_scripts
import_config_and_check import_config
define_program "$p1" define_program "$p1"
combine_all combine_all
if [[ $AutoHelpOther == true ]] && [[ $(ls $dir_code) ]]; then if [[ $AutoHelpOther == true ]] && [[ $(ls $dir_code) ]]; then
@ -117,8 +117,8 @@ run_normal () {
run_concurrent () { run_concurrent () {
local p1=$1 local p1=$1
cd $dir_scripts cd $dir_scripts
import_config_and_check import_config
define_program define_program "$p1"
make_dir $dir_log/$p1 make_dir $dir_log/$p1
log_time=$(date "+%Y-%m-%d-%H-%M-%S.%N") log_time=$(date "+%Y-%m-%d-%H-%M-%S.%N")
echo -e "\n各账号间已经在后台开始并发执行，前台不输入日志，日志直接写入文件中。\n" echo -e "\n各账号间已经在后台开始并发执行，前台不输入日志，日志直接写入文件中。\n"