From 957258240159cfbfa517bd844448db7c75b8cc59 Mon Sep 17 00:00:00 2001 From: whyour Date: Sat, 13 Nov 2021 19:05:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=B7=E8=B4=9D=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shell/share.sh | 2 ++ shell/update.sh | 20 +++++++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/shell/share.sh b/shell/share.sh index 9cf8c42d..baabe695 100755 --- a/shell/share.sh +++ b/shell/share.sh @@ -12,6 +12,7 @@ dir_log=$dir_root/log dir_db=$dir_root/db dir_list_tmp=$dir_log/.tmp dir_code=$dir_log/code +dir_dep=$dir_log/deps dir_update_log=$dir_log/update ql_static_repo=$dir_repo/static @@ -154,6 +155,7 @@ fix_config() { make_dir $dir_repo make_dir $dir_raw make_dir $dir_update_log + make_dir $dir_dep if [[ ! -s $file_config_user ]]; then echo -e "复制一份 $file_config_sample 为 $file_config_user,随后请按注释编辑你的配置文件:$file_config_user\n" diff --git a/shell/update.sh b/shell/update.sh index bd64927a..f30c83e9 100755 --- a/shell/update.sh +++ b/shell/update.sh @@ -391,18 +391,11 @@ gen_list_repo() { if [[ $blackword ]]; then files=$(echo "$files" | egrep -v $blackword) fi - if [[ $dependence ]]; then - # cd ${dir_scripts} - # depInScripts=$(eval $cmd | sed 's/^..//' | egrep -v $uniq_path | egrep $dependence) - # for dep in ${depInScripts}; do - # file_path=$(dirname $dep) - # [[ ! $file_path =~ "/" ]] && file_path="" - # make_dir "${dir_scripts}/${uniq_path}/${file_path#*/}" - # cp -f $dep "${dir_scripts}/${uniq_path}/${file_path#*/}" - # done - cp -f $file_notify_js "${dir_scripts}/${uniq_path}" - cp -f $file_notify_py "${dir_scripts}/${uniq_path}" + cp -f $file_notify_js "${dir_scripts}/${uniq_path}" + cp -f $file_notify_py "${dir_scripts}/${uniq_path}" + + if [[ $dependence ]]; then cd ${repo_path} results=$(eval $cmd | sed 's/^..//' | egrep $dependence) for _file in ${results}; do @@ -411,6 +404,11 @@ gen_list_repo() { cp -f $_file "${dir_scripts}/${uniq_path}/${file_path}" done fi + + if [[ -d $dir_dep ]]; then + cp * "${dir_scripts}/${uniq_path}" &>/dev/null + fi + for file in ${files}; do filename=$(basename $file) cp -f $file "$dir_scripts/${uniq_path}/${filename}"