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

修复diff列表唯一值

Browse Source
This commit is contained in:
whyour 2021-05-14 20:14:08 +08:00
parent dba341bdec
commit c4a4d2550c
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
shell/update.sh
View File

@ -276,10 +276,19 @@ update_qinglong() {
## 对比脚本 ## 对比脚本
diff_scripts() { diff_scripts() {
gen_list_repo $1 $2 $3 $4 $5 local dir_current=$(pwd)
local list_add="$dir_list_tmp/${1}_add.list" local repo_path="$1"
local list_drop="$dir_list_tmp/${1}_drop.list" local author="$2"
diff_cron "$dir_list_tmp/${1}_scripts.list" "$dir_list_tmp/${1}_user.list" $list_add $list_drop local path="$3"
local blackword="$4"
local dependence="$5"
gen_list_repo $repo_path $author $path $blackword $dependence
local repo="${repo_path##*/}"
local list_add="$dir_list_tmp/${repo}_add.list"
local list_drop="$dir_list_tmp/${repo}_drop.list"
diff_cron "$dir_list_tmp/${repo}_scripts.list" "$dir_list_tmp/${repo}_user.list" $list_add $list_drop
if [ -s $list_drop ]; then if [ -s $list_drop ]; then
output_list_add_drop $list_drop "失效" output_list_add_drop $list_drop "失效"
@ -293,6 +302,7 @@ diff_scripts() {
add_cron $list_add $2 add_cron $list_add $2
fi fi
fi fi
cd $dir_current
} }
## 生成脚本的路径清单文件 ## 生成脚本的路径清单文件
@ -303,7 +313,9 @@ gen_list_repo() {
local path="$3" local path="$3"
local blackword="$4" local blackword="$4"
local dependence="$5" local dependence="$5"
rm -f $dir_list_tmp/${repo_path}*.list >/dev/null 2>&1
local repo="${repo_path##*/}"
rm -f $dir_list_tmp/${repo}*.list >/dev/null 2>&1
cd ${repo_path} cd ${repo_path}
files=$(find . -name "*.js" | sed 's/^..//') files=$(find . -name "*.js" | sed 's/^..//')
@ -319,9 +331,9 @@ gen_list_repo() {
for file in ${files}; do for file in ${files}; do
filename=$(basename $file) filename=$(basename $file)
cp -f $file $dir_scripts/${author}_${filename} cp -f $file $dir_scripts/${author}_${filename}
echo ${author}_${filename} >>"$dir_list_tmp/${repo_path}_scripts.list" echo ${author}_${filename} >>"$dir_list_tmp/${repo}_scripts.list"
done done
grep -E "$cmd_task $author" $list_crontab_user | perl -pe "s|.*ID=(.*) $cmd_task ($author_.*)\.*|\2|" | awk -F " " '{print $1}' | sort -u >"$dir_list_tmp/${repo_path}_user.list" grep -E "$cmd_task $author" $list_crontab_user | perl -pe "s|.*ID=(.*) $cmd_task ($author_.*)\.*|\2|" | awk -F " " '{print $1}' | sort -u >"$dir_list_tmp/${repo}_user.list"
cd $dir_current cd $dir_current
} }