修复版本号样式,fix #349

This commit is contained in:
hanhh
2021-06-16 21:06:47 +08:00
parent 63cc3e59b4
commit 896a09d701
4 changed files with 13 additions and 10 deletions
+9 -7
View File
@@ -251,10 +251,10 @@ usage() {
## 更新qinglong
update_qinglong() {
local no_restart="$1"
echo -e "--------------------------------------------------------------\n"
[ -f $dir_root/package.json ] && ql_depend_old=$(cat $dir_root/package.json)
url=https://github.com/whyour/qinglong.git
reset_romote_url ${dir_root} "${github_proxy_url}${url/https:\/\/ghproxy.com\//}"
reset_romote_url ${dir_root} "${github_proxy_url}https://github.com/whyour/qinglong.git"
git_pull_scripts $dir_root
if [[ $exit_status -eq 0 ]]; then
@@ -288,10 +288,12 @@ update_qinglong() {
cd $dir_root
rm -rf $dir_root/build && rm -rf $dir_root/dist
cp -rf $ql_static_repo/* $dir_root
echo -e "重启面板中..."
nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
sleep 1
reload_pm2
if [[ $no_restart != "no-restart" ]]; then
echo -e "重启面板中..."
nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
sleep 1
reload_pm2
fi
else
echo -e "\n更新$dir_root失败,请检查原因...\n"
fi
@@ -401,7 +403,7 @@ main() {
log_path="$dir_log/update/${log_time}_$p1.log"
case $p1 in
update)
update_qinglong | tee $log_path
update_qinglong "$2" | tee $log_path
;;
extra)
run_extra_shell | tee -a $log_path