修复ql repo命令

This commit is contained in:
whyour 2021-05-06 18:08:12 +08:00
parent 962a81c81e
commit c3797e70db
3 changed files with 6 additions and 8 deletions

View File

@ -29,8 +29,7 @@ echo -e "定时任务启动成功...\n"
echo -e "############################################################" echo -e "############################################################"
echo -e "容器启动成功..." echo -e "容器启动成功..."
echo -e "\n请先访问5700端口登录面板成功之后先手动执行一次git_pull命令..." echo -e "\n请先访问5700端口登录面板成功之后先手动执行一次ql update命令..."
echo -e "\n如果需要启动挂机程序手动执行docker exec -it qinglong js hangup..."
echo -e "\n或者去cron管理搜索hangup手动执行挂机任务..." echo -e "\n或者去cron管理搜索hangup手动执行挂机任务..."
echo -e "############################################################" echo -e "############################################################"

View File

@ -48,7 +48,6 @@ original_name=(
## 导入配置文件 ## 导入配置文件
import_config () { import_config () {
[ -f $file_cookie ] && . $file_cookie
[ -f $file_config_user ] && . $file_config_user [ -f $file_config_user ] && . $file_config_user
user_sum=0 user_sum=0
for line in $(cat $file_cookie); do for line in $(cat $file_cookie); do

View File

@ -291,18 +291,18 @@ gen_list_repo() {
local author="$2" local author="$2"
local path="$3" local path="$3"
local blackword="$4" local blackword="$4"
local dependence="$4" local dependence="$5"
rm -f $dir_list_tmp/own*.list >/dev/null 2>&1 rm -f $dir_list_tmp/own*.list >/dev/null 2>&1
cd ${repo_path} cd ${repo_path}
files=$(find . -name "*.js" | sed 's/^..//') files=$(find . -name "*.js" | sed 's/^..//')
if [[ -n $path ]]; then if [[ $path ]]; then
files=$(find . -name "*.js" | sed 's/^..//' | egrep $path) files=$(find . -name "*.js" | sed 's/^..//' | egrep $path)
fi fi
if [[ -n $blackword ]]; then if [[ $blackword ]]; then
files=$(find . -name "*.js" | sed 's/^..//' | egrep -v $blackword | egrep $path) files=$(find . -name "*.js" | sed 's/^..//' | egrep -v $blackword | egrep $path)
fi fi
if [[ -n $dependence ]]; then if [[ $dependence ]]; then
find . -name "*.js" | sed 's/^..//' | egrep $dependence | xargs -i cp {} $dir_scripts find . -name "*.js" | sed 's/^..//' | egrep $dependence | xargs -i cp {} $dir_scripts
fi fi
for file in ${files}; do for file in ${files}; do
@ -341,7 +341,7 @@ main() {
local p2=$2 local p2=$2
local p3=$3 local p3=$3
local p4=$4 local p4=$4
local p4=$5 local p5=$5
log_time=$(date "+%Y-%m-%d-%H-%M-%S") log_time=$(date "+%Y-%m-%d-%H-%M-%S")
log_path="$dir_log/update/${log_time}_$p1.log" log_path="$dir_log/update/${log_time}_$p1.log"
case $p1 in case $p1 in