diff --git a/debian/changelog b/debian/changelog index 845e1a2..e8a0d35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,7 @@ spark-store (4.2.10) stable; urgency=medium * 修复:部分发行版上无法启动自动创建的桌面图标 * 修复:发行版统计信息 * 修复:Gitee反馈链接错误 - * 修复:ACE下无法安装 + * 修复:ACE下无法安装,支持ACE下软件更新 -- shenmo <shenmo@spark-app.store> Sun, 5 Mar 2022 11:45:14 +0800 diff --git a/tool/update-upgrade/ss-do-upgrade-worker.sh b/tool/update-upgrade/ss-do-upgrade-worker.sh index 6271cce..3d5291c 100755 --- a/tool/update-upgrade/ss-do-upgrade-worker.sh +++ b/tool/update-upgrade/ss-do-upgrade-worker.sh @@ -1,14 +1,17 @@ #!/bin/bash + + +case $1 in + ssupdate) if [ "$(id -u)" != "0" ] ; then pkexec "$0" "$@" exit fi - -case $1 in - ssupdate) aptss ssupdate 2>&1 | tee /tmp/spark-store-app-ssupdate-log.txt IS_SSUPDATE_ERROR=`cat /tmp/spark-store-app-ssupdate-log.txt | grep "E: "` echo "$IS_SSUPDATE_ERROR" > /tmp/spark-store-app-ssupdate-status.txt + chmod 777 /tmp/spark-store-app-ssupdate-status.txt + chmod 777 /tmp/spark-store-app-ssupdate-log.txt ;; upgradable-list) @@ -28,11 +31,21 @@ case $1 in ;; upgrade-app) +if [ "$(id -u)" != "0" ] ; then + pkexec "$0" "$@" + exit +fi + aptss install "${@:2}" --only-upgrade 2>&1 | tee /tmp/spark-store-app-upgrade-log.txt + chmod 777 /tmp/spark-store-app-upgrade-log.txt IS_UPGRADE_ERROR=`cat /tmp/spark-store-app-upgrade-log.txt | grep "Package manager quit with exit code."` echo "$IS_UPGRADE_ERROR" > /tmp/spark-store-app-upgrade-status.txt ;; test-install-app) +if [ "$(id -u)" != "0" ] ; then + pkexec "$0" "$@" + exit +fi try_run_output=$(aptss --dry-run install $2) try_run_ret="$?" @@ -63,6 +76,7 @@ fi ;; clean-log) - rm -f /tmp/spark-store-app-ssupdate-status.txt /tmp/spark-store-app-ssupdate-log.txt /tmp/spark-store-app-upgrade-log.txt /tmp/spark-store-app-upgrade-status.txt + + rm -f /tmp/spark-store-app-ssupdate-status.txt /tmp/spark-store-app-ssupdate-log.txt /tmp/spark-store-app-upgrade-log.txt /tmp/spark-store-app-upgrade-status.txt ;; esac diff --git a/tool/update-upgrade/ss-do-upgrade.sh b/tool/update-upgrade/ss-do-upgrade.sh index 23454e4..d4c4e66 100755 --- a/tool/update-upgrade/ss-do-upgrade.sh +++ b/tool/update-upgrade/ss-do-upgrade.sh @@ -49,17 +49,17 @@ touch /tmp/spark-store/upgradeStatus.txt pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh ssupdate | zenity --progress --auto-close --pulsate --no-cancel --text="${TRANSHELL_CONTENT_UPDATE_CHEKING_PLEASE_WAIT}" --height 70 --width 400 --title="${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL}" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg if [ -z `cat /tmp/spark-store-app-ssupdate-status.txt` ] ; then - pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh clean-log + /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh clean-log else zenity --error --text "${TRANSHELL_CONTENT_CHECK_UPDATE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK}" --title "${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL}" --height 200 --width 350 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg zenity --text-info --filename=/tmp/spark-store-app-ssupdate-log.txt --checkbox="${TRANSHELL_CONTENT_I_ALREDY_COPIED_THE_LOG_HERE_AND_WILL_USE_IT_TO_FEEDBACK}" --title="${TRANSHELL_CONTENT_FEEDBACK_CAN_BE_FOUND_IN_THE_SETTINGS}" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg - pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh clean-log + /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh clean-log rm -f /tmp/spark-store/upgradeStatus.txt exit fi # 获取可更新应用列表 -PKG_LIST="$(pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgradable-list)" +PKG_LIST="$(/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgradable-list)" ## 如果没更新,就弹出不需要更新 if [ -z "$PKG_LIST" ] ; then zenity --info --text "${TRANSHELL_CONTENT_NO_NEED_TO_UPGRADE}" --title "${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL}" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg