From fd10a3d7590bce7cf5bbf730e3ed5067c8971d37 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 10 Aug 2021 12:10:01 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=EF=B8=8Fsync=202021-08-10=2012:10:?= =?UTF-8?q?01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Scripts/sh/Helpcode2.8/code.sh | 9 +++++---- Scripts/sh/Helpcode2.8/task_before.sh | 11 ++++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Scripts/sh/Helpcode2.8/code.sh b/Scripts/sh/Helpcode2.8/code.sh index ea86913..ade8a61 100644 --- a/Scripts/sh/Helpcode2.8/code.sh +++ b/Scripts/sh/Helpcode2.8/code.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -## Build 20210807-003 +## Build 20210810-001 ## 导入通用变量与函数 dir_shell=/ql/shell @@ -15,6 +15,7 @@ repo3='he1pu_JDHelp' #预设的 he1pu 仓库 repo4='shufflewzc_faker2' #预设的 shufflewzc 仓库 repo5='Wenmoux_scripts_wen_chinnkarahoi' #预设的 Wenmoux 仓库，用于读取口袋书店互助码。需提前拉取温某人的仓库或口袋书店脚本并完整运行。 repo6='Aaron-lv_sync_jd_scripts' #预设的 Aaron-lv 仓库 +repo7='smiek2221_scripts' #预设的 smiek2221 仓库 repo=$repo6 #默认调用 Aaron-lv 仓库脚本日志 ## 调试模式开关，默认是0，表示关闭；设置为1，表示开启 @@ -425,7 +426,7 @@ local i j k if [ ! -f $ShareCode_log ] || [ -z "$(cat $ShareCode_log | grep "^$config_name_my\d")" ]; then echo -e "\n## $chinese_name\n${config_name_my}1=''\n" >> $ShareCode_log fi -for ((i=1; i<=100; i++)); do +for ((i=1; i<=200; i++)); do local new_code="$(cat $latest_log_path | grep "^$config_name_my$i=.\+'$" | sed "s/\S\+'\([^']*\)'$/\1/")" local old_code="$(cat $ShareCode_log | grep "^$config_name_my$i=.\+'$" | sed "s/\S\+'\([^']*\)'$/\1/")" if [[ $i -le $user_sum ]]; then @@ -463,7 +464,7 @@ local i j k if [ -z "$(cat $ShareCode_log | grep "^$config_name_for_other\d")" ]; then echo -e "${config_name_for_other}1=\"\"" >> $ShareCode_log fi -for ((j=1; j<=100; j++)); do +for ((j=1; j<=200; j++)); do local new_rule="$(cat $latest_log_path | grep "^$config_name_for_other$j=.\+\"$" | sed "s/\S\+\"\([^\"]*\)\"$/\1/")" local old_rule="$(cat $ShareCode_log | grep "^$config_name_for_other$j=.\+\"$" | sed "s/\S\+\"\([^\"]*\)\"$/\1/")" if [[ $j -le $user_sum ]]; then @@ -582,9 +583,9 @@ local array=($(echo $envs | sed 's/&/ /g')) } backup_del(){ +[[ ! -d $dir_log/.bak_ShareCode ]] && mkdir -p $dir_log/.bak_ShareCode local bak_ShareCode_full_path_list=$(find $dir_log/.bak_ShareCode/ -name "*.log") local diff_time -[[ ! -d $dir_log/.bak_ShareCode ]] && mkdir -p $dir_log/.bak_ShareCode if [[ $BACKUP = "1" ]]; then for ((i = 0; i < ${#name_config[*]}; i++)); do [[ -f $dir_log/.ShareCode/${name_config[i]}.log ]] && cp $dir_log/.ShareCode/${name_config[i]}.log $dir_log/.bak_ShareCode/${name_config[i]}_`date "+%Y-%m-%d-%H-%M-%S"`.log diff --git a/Scripts/sh/Helpcode2.8/task_before.sh b/Scripts/sh/Helpcode2.8/task_before.sh index 1f61eb1..5e84044 100644 --- a/Scripts/sh/Helpcode2.8/task_before.sh +++ b/Scripts/sh/Helpcode2.8/task_before.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Build 20210805-001 +# Build 20210810-001 name_js=( jd_fruit @@ -54,8 +54,8 @@ env_name=( JDSGMH_SHARECODES ## 11、闪购盲盒互助码 JDCFD_SHARECODES ## 12、京喜财富岛互助码 JDHEALTH_SHARECODES ## 13、东东健康社区互助码 - CITY_SHARECODES ## 14、城城领现金互助码 - JD818_SHARECODES ## 15、京东手机狂欢城互助码 + JD818_SHARECODES ## 14、京东手机狂欢城互助码 + CITY_SHARECODES ## 15、城城领现金互助码 MONEYTREE_SHARECODES ## 16、摇钱树 JXNCTOKENS ## 17、京喜Token(京喜财富岛提现用) ) @@ -73,8 +73,8 @@ var_name=( ForOtherSgmh ## 11、闪购盲盒互助规则 ForOtherCfd ## 12、京喜财富岛互助规则 ForOtherHealth ## 13、东东健康社区互助规则 - ForOtherCarni ## 14、城城领现金互助规则 - ForOtherCity ## 15、京东手机狂欢城互助规则 + ForOtherCarni ## 14、京东手机狂欢城互助规则 + ForOtherCity ## 15、城城领现金互助规则 ForOtherMoneyTree ## 16、摇钱树 TokenJxnc ## 17、京喜Token(京喜财富岛提现用) ) @@ -116,6 +116,7 @@ combine_sub() { local tmp2=${!tmp1} [[ ${tmp2} ]] && sum=$i || break done + [[ ! $sum ]] && sum=$user_sum for ((j = 1; j <= $sum; j++)); do a=$temp_user_sum b=$sum