Signed-off-by: shenmo <jifengshenmo@outlook.com>
This commit is contained in:
shenmo 2025-04-16 07:29:49 +00:00 committed by Gitee
parent 90ad08a6f9
commit 45c52d7755
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 5 additions and 5 deletions

@ -218,7 +218,7 @@ if [ "$try_run_ret" -ne 0 ]; then ## 若安装检测仍然失败
echo "----------------------------------------" echo "----------------------------------------"
echo "在 $ace_cmd 环境中预检成功,开始安装..." echo "在 $ace_cmd 环境中预检成功,开始安装..."
echo "----------------------------------------" echo "----------------------------------------"
$ace_cmd 'dpkg -i "$DEBPATH" || aptss install "$DEBPATH" -yf' $ace_cmd 'dpkg -i "$DEBPATH" || aptss install "$DEBPATH" -yfq'
success=true success=true
break # 跳出循环 break # 跳出循环
else else
@ -242,7 +242,7 @@ if [ "$try_run_ret" -ne 0 ]; then ## 若安装检测仍然失败
exit "$try_run_ret" exit "$try_run_ret"
fi fi
else ## 如果主机安装检测成功 else ## 如果主机安装检测成功
dpkg -i "$DEBPATH" || aptss install "$DEBPATH" -yf dpkg -i "$DEBPATH" || aptss install "$DEBPATH" -yfq
fi fi
### 退出阶段保持不变 ### ### 退出阶段保持不变 ###

@ -232,7 +232,7 @@ if [ "$try_run_ret" -ne 0 ]; then ## 若安装检测仍然失败
echo "----------------------------------------" echo "----------------------------------------"
echo "在 $ace_cmd 环境中预检成功,开始安装..." echo "在 $ace_cmd 环境中预检成功,开始安装..."
echo "----------------------------------------" echo "----------------------------------------"
$ace_cmd 'dpkg -i "$DEBPATH" || aptss install "$DEBPATH" -yf' $ace_cmd 'dpkg -i "$DEBPATH" || aptss install "$DEBPATH" -yfq'
success=true success=true
break # 跳出循环 break # 跳出循环
else else
@ -256,7 +256,7 @@ if [ "$try_run_ret" -ne 0 ]; then ## 若安装检测仍然失败
exit "$try_run_ret" exit "$try_run_ret"
fi fi
else ## 如果主机安装检测成功 else ## 如果主机安装检测成功
dpkg -i "$DEBPATH" || aptss install "$DEBPATH" -yf dpkg -i "$DEBPATH" || aptss install "$DEBPATH" -yfq
fi fi
### 退出阶段保持不变 ### ### 退出阶段保持不变 ###

@ -146,7 +146,7 @@ for PKG_UPGRADE in $PKG_UPGRADE_LIST; do
update_transhell update_transhell
# 启动升级任务 # 启动升级任务
(yes | pkexec ${HERE}/ss-do-upgrade-worker.sh upgrade-app $PKG_UPGRADE -y 2>&1 > /dev/null ) & (yes n | pkexec ${HERE}/ss-do-upgrade-worker.sh upgrade-app $PKG_UPGRADE -yfq 2>&1 > /dev/null ) &
# 计算进度百分比 # 计算进度百分比
progress=$(( count * 100 / total - 1)) progress=$(( count * 100 / total - 1))