From c160f4105d63bddd19ac6e16e53ddd770adabdbb Mon Sep 17 00:00:00 2001 From: shenmo Date: Mon, 16 Jan 2023 09:13:42 +0000 Subject: [PATCH 01/14] update debian/changelog. Signed-off-by: shenmo --- debian/changelog | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8be9f0b..df8d66d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ spark-store (4.2) stable; urgency=medium * 调整：UOS开发者模式提示现在不会那么挤了 + * 修复：wayland下可正常弹出更新提示 + * 调整：dwine5标签的文案改为：Wine应用 + * 新增：更新软件时弹窗会显示正在更新的软件包名 --shenmo Fri, 30 Jan 2022 00:00:00 +0800 @@ -14,7 +17,7 @@ spark-store (4.2~test2) stable; urgency=medium * 修复: 420t1版本中ssinstall有时会重新下载软件包的问题 * 新增: 安装前会对软件包安装进行dry run以判断是否能正确安装 - * 调整: aptss在进行任何操作前均检测是否存在Packages文件 + * 调整: aptss在进行任何操作前均检测是否存在Packages文件，若存在，则不进行ssupdate * 调整: 修改apt-fast源代码以指定conf位置为/tmp/apt-fast,这部分不再使用bwrap模拟 * 新增: aptss检测Package文件支持分目录（目前指定为store） -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 From 19a1ba42894931134bcae95194a51a3197f8323b Mon Sep 17 00:00:00 2001 From: shenmo Date: Thu, 19 Jan 2023 10:24:30 +0000 Subject: [PATCH 02/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20linux=20mint?= =?UTF-8?q?=E4=B8=8B=E6=97=A0=E6=B3=95=E7=BB=9F=E8=AE=A1=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shenmo --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index eff633e..29d980e 100644 --- a/debian/control +++ b/debian/control @@ -41,6 +41,7 @@ Depends:${shlibs:Depends}, ${misc:Depends}, bubblewrap, aria2, gcc, - zenity + zenity, + libc6-dev Description: Spark Store A community powered app store, based on DTK. From 384d4b300dd336373e61969179be57438c477148 Mon Sep 17 00:00:00 2001 From: shenmo Date: Fri, 20 Jan 2023 00:15:24 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=9C=A8=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E5=89=8D=E8=BF=9B=E8=A1=8C=E6=B5=8B=E8=AF=95=EF=BC=88?= =?UTF-8?q?ss-do-upgrade-worker=EF=BC=89=20=E7=94=A8=E6=B3=95=EF=BC=9Apkex?= =?UTF-8?q?ec=20/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-?= =?UTF-8?q?worker.sh=20test-install-app=20pkgname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 7 +++++++ src/main.cpp | 2 +- tool/update-upgrade/ss-do-upgrade-worker.sh | 15 +++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index df8d66d..04bf141 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +spark-store (4.2.1) stable; urgency=medium + + * 调整：支持在安装前进行测试（ss-do-upgrade-worker） + * 修复： 因依赖不完全导致在LinuxMint下无法下载统计 + + --shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (4.2) stable; urgency=medium * 调整：UOS开发者模式提示现在不会那么挤了 diff --git a/src/main.cpp b/src/main.cpp index 8cc8ba3..c52ffab 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -15,7 +15,7 @@ DWIDGET_USE_NAMESPACE int main(int argc, char *argv[]) { // Get build time - static const QString version = "4.2"; + static const QString version = "4.2.1"; static const QDate buildDate = QLocale(QLocale::English).toDate(QString(__DATE__).replace(" ", " 0"), "MMM dd yyyy"); static const QTime buildTime = QTime::fromString(__TIME__, "hh:mm:ss"); static const QString buildDateTime = buildDate.toString("yyyy.MM.dd") + "-" + buildTime.toString("hh:mm:ss"); diff --git a/tool/update-upgrade/ss-do-upgrade-worker.sh b/tool/update-upgrade/ss-do-upgrade-worker.sh index 04c082c..d6cf44e 100755 --- a/tool/update-upgrade/ss-do-upgrade-worker.sh +++ b/tool/update-upgrade/ss-do-upgrade-worker.sh @@ -32,6 +32,21 @@ case $1 in 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) + try_run_output=$(aptss --dry-run install $@) + try_run_ret="$?" + + if [ "$try_run_ret" -ne 0 ] + then + echo "Package manager quit with exit code.Here is the log" + echo "包管理器以错误代码退出.日志如下" + echo + echo -e "${try_run_output}" + exit "$try_run_ret" + fi + + exit 0 + ;; 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 From a7cb44348d47135cbee9eafe1ba2096a68be9f22 Mon Sep 17 00:00:00 2001 From: shenmo Date: Fri, 20 Jan 2023 00:17:35 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A5=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E7=94=A8=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tool/update-upgrade/ss-do-upgrade-worker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/update-upgrade/ss-do-upgrade-worker.sh b/tool/update-upgrade/ss-do-upgrade-worker.sh index d6cf44e..390f8c8 100755 --- a/tool/update-upgrade/ss-do-upgrade-worker.sh +++ b/tool/update-upgrade/ss-do-upgrade-worker.sh @@ -33,7 +33,7 @@ case $1 in echo "$IS_UPGRADE_ERROR" > /tmp/spark-store-app-upgrade-status.txt ;; test-install-app) - try_run_output=$(aptss --dry-run install $@) + try_run_output=$(aptss --dry-run install $2) try_run_ret="$?" if [ "$try_run_ret" -ne 0 ] From 0b2290344b7ee37b052b07239f775b1bedde465b Mon Sep 17 00:00:00 2001 From: shenmo Date: Fri, 20 Jan 2023 00:18:20 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E7=A7=BB=E9=99=A4ssinstall=E7=9A=84?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tool/ssinstall | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tool/ssinstall b/tool/ssinstall index e5dbee7..49f610f 100755 --- a/tool/ssinstall +++ b/tool/ssinstall @@ -78,17 +78,6 @@ if [ ! -z "$IS_MD5SUM_CHECKD" ];then echo "校验成功，开始安装" echo ---------------------------------------------------------------------------------- -try_run_output=$(aptss --dry-run install $DEBPATH) -try_run_ret="$?" - - if [ "$try_run_ret" -ne 0 ] - then - echo "Package manager quit with exit code.Here is the log" - echo "包管理器以错误代码退出.日志如下" - echo - echo -e "${try_run_output}" - exit "$try_run_ret" - fi dpkg -i "$DEBPATH" || aptss install -yf From f2a4ce3b2530185f103a982130245931982b42ac Mon Sep 17 00:00:00 2001 From: shenmo Date: Fri, 20 Jan 2023 09:24:50 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E6=96=87=E6=A1=88=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=9AUbuntu=20tag=E7=8E=B0=E5=9C=A8=E6=8C=87=E7=9A=84?= =?UTF-8?q?=E6=98=AF22.04?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/appintopage.ui | 4 ++-- translations/spark-store_en.ts | 12 ++++++------ translations/spark-store_fr.ts | 12 ++++++------ translations/spark-store_zh_CN.ts | 10 +++++++--- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/pages/appintopage.ui b/src/pages/appintopage.ui index c9577e6..c3c8024 100644 --- a/src/pages/appintopage.ui +++ b/src/pages/appintopage.ui @@ -426,10 +426,10 @@ - <html><head/><body><p>Capable to Ubuntu 20.04</p></body></html> + <html><head/><body><p>Capable to Ubuntu 22.04</p></body></html> - <html><head/><body><p>Capable to Ubuntu 20.04</p></body></html> + <html><head/><body><p>Capable to Ubuntu 22.04</p></body></html> <html><head/><body><p><img src=":/tags/ubuntu-small.png"/></p></body></html> diff --git a/translations/spark-store_en.ts b/translations/spark-store_en.ts index 5fa26a6..887820e 100644 --- a/translations/spark-store_en.ts +++ b/translations/spark-store_en.ts @@ -42,12 +42,6 @@ <html><head/><body><p><img src=":/tags/community-small.png"/></p></body></html> - - - - <html><head/><body><p>Capable to Ubuntu 20.04</p></body></html> - - <html><head/><body><p><img src=":/tags/ubuntu-small.png"/></p></body></html> @@ -138,6 +132,12 @@ Screen capture + + + + <html><head/><body><p>Capable to Ubuntu 22.04</p></body></html> + + diff --git a/translations/spark-store_fr.ts b/translations/spark-store_fr.ts index a12364c..2e1a0db 100644 --- a/translations/spark-store_fr.ts +++ b/translations/spark-store_fr.ts @@ -42,12 +42,6 @@ <html><head/><body><p><img src=":/tags/community-small.png"/></p></body></html> - - - - <html><head/><body><p>Capable to Ubuntu 20.04</p></body></html> - - <html><head/><body><p><img src=":/tags/ubuntu-small.png"/></p></body></html> @@ -138,6 +132,12 @@ Screen capture + + + + <html><head/><body><p>Capable to Ubuntu 22.04</p></body></html> + + diff --git a/translations/spark-store_zh_CN.ts b/translations/spark-store_zh_CN.ts index dca880e..0a7cf03 100644 --- a/translations/spark-store_zh_CN.ts +++ b/translations/spark-store_zh_CN.ts @@ -43,10 +43,8 @@ - - <html><head/><body><p>Capable to Ubuntu 20.04</p></body></html> - <html><head/><body><p>支持Ubuntu 20.04</p></body></html> + <html><head/><body><p>支持Ubuntu 20.04</p></body></html> @@ -137,6 +135,12 @@ Screen capture 屏幕截图 + + + + <html><head/><body><p>Capable to Ubuntu 22.04</p></body></html> + <html><head/><body><p>支持Ubuntu 22.04</p></body></html> {22.04<?} + From 8d41966d674820675e0ab9240e8012cab6c92331 Mon Sep 17 00:00:00 2001 From: shenmo Date: Fri, 20 Jan 2023 09:30:33 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E5=A5=87=E6=80=AA=E7=9A=84=E7=AC=A6?= =?UTF-8?q?=E5=8F=B7=E6=AE=8B=E7=95=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- translations/spark-store_zh_CN.ts | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/translations/spark-store_zh_CN.ts b/translations/spark-store_zh_CN.ts index 0a7cf03..8c5c406 100644 --- a/translations/spark-store_zh_CN.ts +++ b/translations/spark-store_zh_CN.ts @@ -42,10 +42,6 @@ <html><head/><body><p><img src=":/tags/community-small.png"/></p></body></html> - - <html><head/><body><p>Capable to Ubuntu 20.04</p></body></html> - <html><head/><body><p>支持Ubuntu 20.04</p></body></html> - <html><head/><body><p><img src=":/tags/ubuntu-small.png"/></p></body></html> @@ -106,10 +102,6 @@ <html><head/><body><p><img src=":/tags/a2d-small.png"/></p></body></html> - - <html><head/><body><p>A deepin-wine5 app.Spark Store will automatically configure the wine kit for you</p></body></html> - 这是一款 deepin-wine5 应用。星火商店会为你自动配置wine环境 - <html><head/><body><p><img src=":/tags/dwine5-small.png"/></p></body></html> @@ -139,7 +131,7 @@ <html><head/><body><p>Capable to Ubuntu 22.04</p></body></html> - <html><head/><body><p>支持Ubuntu 22.04</p></body></html> {22.04<?} + <html><head/><body><p>支持Ubuntu 22.04</p></body></html> From 72ba481180af540b3b80a4e5bc116c9f8c16c3cf Mon Sep 17 00:00:00 2001 From: shenmo Date: Thu, 26 Jan 2023 17:05:35 +0000 Subject: [PATCH 08/14] update tool/ssinstall. Signed-off-by: shenmo --- tool/ssinstall | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tool/ssinstall b/tool/ssinstall index 49f610f..c3794da 100755 --- a/tool/ssinstall +++ b/tool/ssinstall @@ -3,16 +3,11 @@ echo "Spark Store Install script.星火商店安装脚本" function pkexec_as_current_user() { - #Detect the name of the display in use - local display=":$(ls /tmp/.X11-unix/* | sed 's#/tmp/.X11-unix/X##' | head -n 1)" - - #Detect the user using such display - local user=$(who | grep '('$display')' | awk '{print $1}' | head -n 1) #Detect the id of the user local uid=$(id -u $user) - sudo -u $user DISPLAY=$display DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$uid/bus pkexec "$@" + sudo -u $user DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$uid/bus pkexec "$@" } function zenity() { From e2f27c774649a9d8957406f21197f3cb0a05db11 Mon Sep 17 00:00:00 2001 From: shenmo Date: Fri, 27 Jan 2023 11:24:20 +0800 Subject: [PATCH 09/14] transhell update 1 --- tool/update-upgrade/ss-do-upgrade.sh | 32 ++++++++++++++----- tool/update-upgrade/ss-update-controler.sh | 11 +++---- tool/update-upgrade/ss-update-notifier.sh | 27 +++++++++++++--- .../ss-do-upgrade.sh_zh_CN.transhell | 9 ++++++ .../ss-update-notifier.sh_en_US.transhell | 5 +++ .../ss-update-notifier.sh_zh_CN.transhell | 5 +++ 6 files changed, 70 insertions(+), 19 deletions(-) create mode 100644 tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_CN.transhell create mode 100644 tool/update-upgrade/transhell/ss-update-notifier.sh_en_US.transhell create mode 100644 tool/update-upgrade/transhell/ss-update-notifier.sh_zh_CN.transhell diff --git a/tool/update-upgrade/ss-do-upgrade.sh b/tool/update-upgrade/ss-do-upgrade.sh index f87e3b3..c0ee1ce 100755 --- a/tool/update-upgrade/ss-do-upgrade.sh +++ b/tool/update-upgrade/ss-do-upgrade.sh @@ -1,16 +1,32 @@ #!/bin/bash + +##load transhell +function load_transhell() +{ +WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +CURRENT_LANG="$(echo $LANG | cut -c -5)" +if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell ..."; fi +if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi +if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell ..."; fi +if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi + +echo "-----------------------------------------------------------------------------" +} + +load_transhell + + touch /tmp/spark-store/upgradeStatus.txt # 执行 apt update -pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh ssupdate | zenity --progress --auto-close --pulsate --no-cancel --text="正在检查更新，请稍候..." --height 70 --width 400 --title="星火商店更新模块" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg +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 - echo "无错误" pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh clean-log else - zenity --error --text "检查更新进程出现错误！按确定查看报错，可用于反馈" --title "星火商店更新检测模块" --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="我已复制了此文本框中的日志，且将会在反馈时附上。反馈渠道可以在右上角菜单的设置中找到" --title="反馈渠道在商店右上角的设置里" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg + 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 rm -f /tmp/spark-store/upgradeStatus.txt exit @@ -20,7 +36,7 @@ fi PKG_LIST="$(pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgradable-list)" ## 如果没更新，就弹出不需要更新 if [ -z "$PKG_LIST" ] ; then - zenity --info --text "没有软件需要更新\n但是你并没有站在世界之巅" --title "星火商店更新检测模块" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg + 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 else ## 获取用户选择的要更新的应用 ### 指定分隔符为 \n @@ -45,7 +61,7 @@ else echo "$PKG_CUR_VER" else echo "false" - echo "$PKG_NAME（无法更新：已被标记为保留）" + echo "$PKG_NAME${TRANSHELL_CONTENT_CAN_NOT_UPGRADE_FOR_BEING_HOLD}" echo "$PKG_NEW_VER" echo "$PKG_CUR_VER" fi @@ -56,9 +72,9 @@ done` ## 如果没有应用需要更新，则直接退出 if [ -z "$PKG_UPGRADE_LIST" ] ; then - zenity --info --text "没有软件需要更新\n但是你并没有站在世界之巅" --title "星火商店更新检测服务" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg + 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 else - PKG_UPGRADE_LIST=$(echo "$PKG_UPGRADE_LIST" | zenity --list --text="选择你想更新的应用" --column="是否更新" --column="包名" --column="新版本" --column="从该版本更新" --separator=" " --checklist --multiple --print-column=2 --height 350 --width 550 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg) + PKG_UPGRADE_LIST=$(echo "$PKG_UPGRADE_LIST" | zenity --list --text="${TRANSHELL_CONTENT_CHOOSE_APP_TO_UPGRADE}" --column="是否更新" --column="包名" --column="新版本" --column="从该版本更新" --separator=" " --checklist --multiple --print-column=2 --height 350 --width 550 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg) ## 如果没有选择，则直接退出 if [ -z "$PKG_UPGRADE_LIST" ] ; then zenity --info --text "没有选中任何软件\n但是你并没有站在世界之巅" --title "星火商店更新检测服务" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg diff --git a/tool/update-upgrade/ss-update-controler.sh b/tool/update-upgrade/ss-update-controler.sh index a918fcd..de0cc18 100755 --- a/tool/update-upgrade/ss-update-controler.sh +++ b/tool/update-upgrade/ss-update-controler.sh @@ -15,13 +15,10 @@ fi -option=`zenity --list --text="欢迎使用星火更新和安装设置工具\n请在以下操作中选择一个进行~" --column 数字 --column=操作选项 --print-column=2 --height 350 --width 760 0 "查看自动更新相关功能使用前须知（重要）" 1 "$text_update_open星火更新检测工具(如果开启则会在系统启动后自动检测更新。如有更新则会弹出通知)" 2 查看可更新软件包列表并决定是否更新 4 退出脚本 --hide-column=1 --print-column=1` +option=`zenity --list --text="欢迎使用星火更新和安装设置工具\n请在以下操作中选择一个进行~" --column 数字 --column=操作选项 --print-column=2 --height 350 --width 760 0 "$text_update_open星火更新检测工具(如果开启则会在系统启动后自动检测更新。如有更新则会弹出通知)" 1 查看可更新软件包列表并决定是否更新 2 退出脚本 --hide-column=1 --print-column=1` case $option in 0) - zenity --info --icon-name=spark-store --height 450 --width 500 --text "此须知适用于自动更新功能\n\n此脚本可以检测星火源中是否有比当前系统更高版本的软件包，由您决定是否安装；在安装更新过程中请不要直接点击关闭本页面，以免发生错误\n\n此脚本使用apt update/apt list --upgrade/apt upgrade来更新软件源、列出更新列表和操作更新\n\n该脚本不对其使用效果有任何明示或暗示的担保，在使用前请您确保您清楚地知道您在干什么。您应当清楚，星火商店的软件包并不是适配所有发行版的；尽管绝大多数的软件更新是无害的，您仍然应该仔细检查显示出来的更新内容，以确保不会对您的依赖环境造成破坏，尤其是那些看起来和系统依赖相关的软件包。在查看过更新列表之后，确认更新之前，您仍有取消更新的机会。\n\n本脚本的开发者不对使用该脚本可能造成的后果负责" - ;; - 1) if [ -e /etc/systemd/system/multi-user.target.wants/spark-update-notifier.service ];then zenity --info --icon-name=spark-store --height 150 --width 200 --text "检测到已经启动了自动更新检测，执行关闭" --timeout=2 pkexec systemctl disable spark-update-notifier @@ -34,15 +31,15 @@ case $option in fi ;; - 2) + 1) /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade.sh ;; - 4) + 2) exit 0 ;; *) exit 0 esac -done \ No newline at end of file +done diff --git a/tool/update-upgrade/ss-update-notifier.sh b/tool/update-upgrade/ss-update-notifier.sh index 7880ee7..fbb7e95 100755 --- a/tool/update-upgrade/ss-update-notifier.sh +++ b/tool/update-upgrade/ss-update-notifier.sh @@ -1,6 +1,25 @@ #!/bin/bash LANGUAGE=en_US + +##load transhell +function load_transhell() +{ +WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +CURRENT_LANG="$(echo $LANG | cut -c -5)" +if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell ..."; fi +if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi +if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell ..."; fi +if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi + +echo "-----------------------------------------------------------------------------" +} + +load_transhell + +############################################################# + + # 发送通知 function notify-send() { @@ -37,7 +56,7 @@ function network() network if [ $? -ne 0 ] ; then - echo "Network fail. Stop to avoid bother dpkg" + echo "$TRANSHELL_CONTENT_NETWORK_FAIL" exit -1 fi @@ -51,7 +70,7 @@ curl --progress-bar -o /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d updatetext=`aptss ssupdate 2>&1` until [ "`echo $updatetext | grep E: `" = "" ];do -echo "更新出现异常状况，等待十五秒" +echo "${TRANSHELL_CONTENT_UPDATE_ERROR_AND_WAIT_15_SEC}" sleep 15 updatetext=`aptss ssupdate 2>&1` @@ -95,10 +114,10 @@ done # 还原分隔符 IFS="$IFS_OLD" - if [ $update_app_number -le 0 ] ; then exit 0 fi +load_transhell ## 如果都是hold或者版本一致的那就直接退出，否则把剩余的给提醒了 -notify-send -a spark-store "星火更新提醒" "星火商店仓库中有$update_app_number个软件包可以更新啦！请到星火商店的菜单处理" \ No newline at end of file +notify-send -a spark-store "${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_NOTIFY}" "${TRANSHELL_CONTENT_THERE_ARE_APPS_TO_UPGRADE}" diff --git a/tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_CN.transhell b/tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_CN.transhell new file mode 100644 index 0000000..83d9d77 --- /dev/null +++ b/tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_CN.transhell @@ -0,0 +1,9 @@ +#!/bin/bash +TRANSHELL_CONTENT_UPDATE_CHEKING_PLEASE_WAIT="正在检查更新，请稍候..." +TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL="星火商店更新模块" +TRANSHELL_CONTENT_CHECK_UPDATE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK="检查更新进程出现错误！按确定查看报错，可用于反馈" +TRANSHELL_CONTENT_I_ALREDY_COPIED_THE_LOG_HERE_AND_WILL_USE_IT_TO_FEEDBACK="我已复制了此文本框中的日志，且将会在反馈时附上。反馈渠道可以在右上角菜单的设置中找到" +TRANSHELL_CONTENT_FEEDBACK_CAN_BE_FOUND_IN_THE_SETTINGS="反馈渠道在商店右上角的设置里" +TRANSHELL_CONTENT_NO_NEED_TO_UPGRADE="没有软件需要更新\n但是你并没有站在世界之巅" +TRANSHELL_CONTENT_CAN_NOT_UPGRADE_FOR_BEING_HOLD="（无法更新：已被标记为保留）" +TRANSHELL_CONTENT_CHOOSE_APP_TO_UPGRADE="选择你想更新的应用" diff --git a/tool/update-upgrade/transhell/ss-update-notifier.sh_en_US.transhell b/tool/update-upgrade/transhell/ss-update-notifier.sh_en_US.transhell new file mode 100644 index 0000000..fa28962 --- /dev/null +++ b/tool/update-upgrade/transhell/ss-update-notifier.sh_en_US.transhell @@ -0,0 +1,5 @@ +#!/bin/bash +TRANSHELL_CONTENT_NETWORK_FAIL="Network fail. Stop to avoid bother dpkg" +TRANSHELL_CONTENT_UPDATE_ERROR_AND_WAIT_15_SEC="Update error! Wait for 15 seconds..." +TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_NOTIFY="Spark Store Upgrade Notifier" +TRANSHELL_CONTENT_THERE_ARE_APPS_TO_UPGRADE="There are ${update_app_number} APPs available to upgrade! Please go to Spark Store to upgrade." diff --git a/tool/update-upgrade/transhell/ss-update-notifier.sh_zh_CN.transhell b/tool/update-upgrade/transhell/ss-update-notifier.sh_zh_CN.transhell new file mode 100644 index 0000000..668fa14 --- /dev/null +++ b/tool/update-upgrade/transhell/ss-update-notifier.sh_zh_CN.transhell @@ -0,0 +1,5 @@ +#!/bin/bash +TRANSHELL_CONTENT_NETWORK_FAIL="网络错误！为防止阻塞dpkg,停止" +TRANSHELL_CONTENT_UPDATE_ERROR_AND_WAIT_15_SEC="更新出现异常状况，等待十五秒" +TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_NOTIFY="星火更新提醒" +TRANSHELL_CONTENT_THERE_ARE_APPS_TO_UPGRADE="星火商店仓库中有$update_app_number个软件包可以更新啦！请到星火商店的菜单处理" From f2e1219a833974f398558af42bbc1ea972dba468 Mon Sep 17 00:00:00 2001 From: shenmo Date: Fri, 27 Jan 2023 12:22:32 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 3 +- tool/ssinstall | 59 ++++++++++++++++--- tool/transhell/ssinstall_en_US.transhell | 4 ++ tool/transhell/ssinstall_zh_CN.transhell | 4 ++ tool/update-upgrade/ss-do-upgrade.sh | 25 ++++++-- tool/update-upgrade/ss-update-controler.sh | 44 +++++++++++--- tool/update-upgrade/ss-update-notifier.sh | 13 +++- .../ss-do-upgrade.sh_en_US.transhell | 17 ++++++ .../ss-do-upgrade.sh_zh_CN.transhell | 8 +++ .../ss-update-controler.sh_en_US.transhell | 12 ++++ .../ss-update-controler.sh_zh_CN.transhell | 12 ++++ 11 files changed, 176 insertions(+), 25 deletions(-) create mode 100644 tool/transhell/ssinstall_en_US.transhell create mode 100644 tool/transhell/ssinstall_zh_CN.transhell create mode 100644 tool/update-upgrade/transhell/ss-do-upgrade.sh_en_US.transhell create mode 100644 tool/update-upgrade/transhell/ss-update-controler.sh_en_US.transhell create mode 100644 tool/update-upgrade/transhell/ss-update-controler.sh_zh_CN.transhell diff --git a/debian/changelog b/debian/changelog index 04bf141..69b5234 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ spark-store (4.2.1) stable; urgency=medium * 调整：支持在安装前进行测试（ss-do-upgrade-worker） - * 修复： 因依赖不完全导致在LinuxMint下无法下载统计 + * 修复：因依赖不完全导致在LinuxMint下无法下载统计 + * 新增：脚本系列应用支持英文 --shenmo Fri, 30 Jan 2022 00:00:00 +0800 diff --git a/tool/ssinstall b/tool/ssinstall index c3794da..ff7a103 100755 --- a/tool/ssinstall +++ b/tool/ssinstall @@ -1,5 +1,39 @@ #!/bin/bash + +##load transhell +function load_transhell() +{ +WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +CURRENT_LANG="$(echo $LANG | cut -c -5)" +if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell ..."; fi +if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi +if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell ..."; fi +if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi + +echo "-----------------------------------------------------------------------------" +} + + +function update_transhell() +{ +WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +CURRENT_LANG="$(echo $LANG | cut -c -5)" +if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; fi +if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi +if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; fi +if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi + +} + +load_transhell + + + + + + + echo "Spark Store Install script.星火商店安装脚本" function pkexec_as_current_user() { @@ -32,13 +66,13 @@ fi if [ ! -f "$1" ] then - echo "文件不存在" + echo "${TRANSHELL_CONTENT_FILE_NOT_EXIST}" exit 1 fi if [ "$(id -u)" != "0" ];then #############################无root权限时 -echo "请使用root启动ssinstall" +echo "${TRANSHELL_CONTENT_PLEASE_RUN_AS_ROOT}" exit 1 fi @@ -74,19 +108,26 @@ if [ ! -z "$IS_MD5SUM_CHECKD" ];then echo "校验成功，开始安装" echo ---------------------------------------------------------------------------------- +try_run_output=$(aptss --dry-run install $DEBPATH) +try_run_ret="$?" + + if [ "$try_run_ret" -ne 0 ] + then + echo "Package manager quit with exit code.Here is the log" + echo "包管理器以错误代码退出.日志如下" + echo + echo -e "${try_run_output}" + exit "$try_run_ret" + fi + dpkg -i "$DEBPATH" || aptss install -yf else -zenity --info --icon-name=spark-store --height 270 --width 500 --text "软件包校验失败！这不应该发生！\n可能是因为软件包已损坏，星火仓库未同步，或者最坏的情况：恶意软件尝试利用自动安装来入侵系统！\n如果你不清楚发生了什么，请在接下来的认证窗口中选择取消认证\n执行 sudo aptss ssupdate 后再尝试安装。\n如果问题仍然存在，请在应用信息界面点击 应用反馈 来提交反馈给我们！\n\n 如果你是审核人员，请使用 ssaudit来替代ssinstall进行审核工作，因为现在ssinstall已经被用于免密安装。\n如果你正在尝试安装已经下架的星火应用，也可用ssaudit来替代ssinstall" - -echo "软件包校验失败！这不应该发生！" -echo "执行 sudo aptss ssupdate 后再尝试安装。" -echo "如果问题仍然存在，请在应用信息界面点击 应用反馈 来提交反馈给我们！" -echo "如果你是审核人员，请使用 ssaudit来替代ssinstall进行审核工作，因为现在ssinstall已经被用于免密安装" -echo "如果你正在尝试安装已经下架的星火应用，也可用ssaudit来替代ssinstall" +zenity --info --icon-name=spark-store --height 270 --width 500 --text "${TRANSHELL_CONTENT_HASH_CHECK_FAILED}" +echo -e ${TRANSHELL_CONTENT_HASH_CHECK_FAILED} fi diff --git a/tool/transhell/ssinstall_en_US.transhell b/tool/transhell/ssinstall_en_US.transhell new file mode 100644 index 0000000..aa85c03 --- /dev/null +++ b/tool/transhell/ssinstall_en_US.transhell @@ -0,0 +1,4 @@ +#!/bin/bash +TRANSHELL_CONTENT_HASH_CHECK_FAILED="Failed in checking package hash! \nPossibly reason can be the package is broken, laggy in sync of Spark Store repository, or, there is a malware attempt to attack. \nIf you don't know what happend, please try install again after execute the command below\n sudo aptss ssupdate\n\nIf the problem still happen, please click APP Feedback button in the APP information page to feedback to us.\n\n If you are in the Audition Group，Please use ssaudit instead of ssinstall to audit APPs，for ssinstall is used for password-free install now.\nIf you want to install an app that is removed from Spark Store repository，you can also use ssaudit." +TRANSHELL_CONTENT_PLEASE_RUN_AS_ROOT="Please run ssinstall as root" +TRANSHELL_CONTENT_FILE_NOT_EXIST="File not exist" diff --git a/tool/transhell/ssinstall_zh_CN.transhell b/tool/transhell/ssinstall_zh_CN.transhell new file mode 100644 index 0000000..44bc3fb --- /dev/null +++ b/tool/transhell/ssinstall_zh_CN.transhell @@ -0,0 +1,4 @@ +#!/bin/bash +TRANSHELL_CONTENT_HASH_CHECK_FAILED="软件包校验失败！这不应该发生！\n可能是因为软件包已损坏，星火仓库未同步，或者最坏的情况：恶意软件尝试利用自动安装来入侵系统！\n如果你不清楚发生了什么，请执行 sudo aptss ssupdate 后再尝试安装。\n如果问题仍然存在，请在应用信息界面点击 应用反馈 来提交反馈给我们！\n\n 如果你是审核人员，请使用 ssaudit来替代ssinstall进行审核工作，因为现在ssinstall已经被用于免密安装。\n如果你正在尝试安装已经下架的星火应用，也可用ssaudit来替代ssinstall" +TRANSHELL_CONTENT_PLEASE_RUN_AS_ROOT="请使用root启动ssinstall" +TRANSHELL_CONTENT_FILE_NOT_EXIST="文件不存在" diff --git a/tool/update-upgrade/ss-do-upgrade.sh b/tool/update-upgrade/ss-do-upgrade.sh index c0ee1ce..97fad77 100755 --- a/tool/update-upgrade/ss-do-upgrade.sh +++ b/tool/update-upgrade/ss-do-upgrade.sh @@ -14,6 +14,18 @@ if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then echo "-----------------------------------------------------------------------------" } + +function update_transhell() +{ +WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +CURRENT_LANG="$(echo $LANG | cut -c -5)" +if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; fi +if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi +if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; fi +if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi + +} + load_transhell @@ -74,22 +86,23 @@ done` if [ -z "$PKG_UPGRADE_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 else - PKG_UPGRADE_LIST=$(echo "$PKG_UPGRADE_LIST" | zenity --list --text="${TRANSHELL_CONTENT_CHOOSE_APP_TO_UPGRADE}" --column="是否更新" --column="包名" --column="新版本" --column="从该版本更新" --separator=" " --checklist --multiple --print-column=2 --height 350 --width 550 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg) + PKG_UPGRADE_LIST=$(echo "$PKG_UPGRADE_LIST" | zenity --list --text="${TRANSHELL_CONTENT_CHOOSE_APP_TO_UPGRADE}" --column="${TRANSHELL_CONTENT_CHOOSE}" --column="${TRANSHELL_CONTENT_PKG_NAME}" --column="${TRANSHELL_CONTENT_NEW_VERSION}" --column="${TRANSHELL_CONTENT_UPGRADE_FROM}" --separator=" " --checklist --multiple --print-column=2 --height 350 --width 550 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg) ## 如果没有选择，则直接退出 if [ -z "$PKG_UPGRADE_LIST" ] ; then - zenity --info --text "没有选中任何软件\n但是你并没有站在世界之巅" --title "星火商店更新检测服务" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg + zenity --info --text "${TRANSHELL_CONTENT_NO_APP_IS_CHOSEN}" --title "${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL}" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg else ### 更新用户选择的应用 for PKG_UPGRADE in $PKG_UPGRADE_LIST;do - pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgrade-app $PKG_UPGRADE -y | zenity --progress --auto-close --no-cancel --pulsate --text="正在更新 $PKG_UPGRADE ，请稍候..." --height 70 --width 400 --title="星火商店更新模块" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg + update_transhell + pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgrade-app $PKG_UPGRADE -y | zenity --progress --auto-close --no-cancel --pulsate --text="${TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT}" --height 70 --width 400 --title="${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL}" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg done #### 更新成功 if [ -z "`cat /tmp/spark-store-app-upgrade-status.txt`" ] ; then - zenity --info --text "选中的软件已经更新完毕" --title "星火商店更新检测模块" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg + zenity --info --text "${TRANSHELL_CONTENT_CHOSEN_APP_UPGRADE_FINISHED}" --title "${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL}" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg else #### 更新异常 - zenity --error --text "更新出现错误！按确定查看报错，可用于反馈" --title "星火商店更新检测模块" --height 200 --width 350 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg - zenity --text-info --filename=/tmp/spark-store-app-upgrade-log.txt --checkbox="我已复制了此文本框中的日志，且将会在反馈时附上 。反馈渠道可以在右上角菜单的设置中找到" --title="反馈渠道在商店右上角的设置里往下拉" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg + zenity --error --text "${TRANSHELL_CONTENT_APP_UGRADE_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-upgrade-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 fi fi fi diff --git a/tool/update-upgrade/ss-update-controler.sh b/tool/update-upgrade/ss-update-controler.sh index de0cc18..5c3fb6c 100755 --- a/tool/update-upgrade/ss-update-controler.sh +++ b/tool/update-upgrade/ss-update-controler.sh @@ -1,33 +1,61 @@ #!/bin/bash + +##load transhell +function load_transhell() +{ +WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +CURRENT_LANG="$(echo $LANG | cut -c -5)" +if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell ..."; fi +if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi +if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell ..."; fi +if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi + +echo "-----------------------------------------------------------------------------" +} + + +function update_transhell() +{ +WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +CURRENT_LANG="$(echo $LANG | cut -c -5)" +if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; fi +if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi +if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; fi +if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi + +} + +load_transhell + endloop=0 #####################检测是否启动过了更新检测工具 while [ $endloop -eq 0 ] ;do if [ -e /etc/systemd/system/multi-user.target.wants/spark-update-notifier.service ];then -text_update_open="关闭" +text_update_open="${TRANSHELL_CONTENT_CLOSE}" #已经开启了就显示关闭 else -text_update_open="开启" +text_update_open="${TRANSHELL_CONTENT_OPEN}" fi +update_transhell - -option=`zenity --list --text="欢迎使用星火更新和安装设置工具\n请在以下操作中选择一个进行~" --column 数字 --column=操作选项 --print-column=2 --height 350 --width 760 0 "$text_update_open星火更新检测工具(如果开启则会在系统启动后自动检测更新。如有更新则会弹出通知)" 1 查看可更新软件包列表并决定是否更新 2 退出脚本 --hide-column=1 --print-column=1` +option=`zenity --list --text="${TRANSHELL_CONTENT_WELCOME_AND_CHOOSE_ONE_TO_RUN}" --column 数字 --column=${TRANSHELL_CONTENT_OPTIONS} --print-column=2 --height 350 --width 760 0 "${TRANSHELL_CONTENT_OPEN_OR_CLOSE_UPGRADE_CHECK}" 1 "${TRANSHELL_CONTENT_CHECK_FOR_UPDATE}" 2 "${TRANSHELL_CONTENT_EXIT}" --hide-column=1 --print-column=1` case $option in 0) if [ -e /etc/systemd/system/multi-user.target.wants/spark-update-notifier.service ];then - zenity --info --icon-name=spark-store --height 150 --width 200 --text "检测到已经启动了自动更新检测，执行关闭" --timeout=2 + zenity --info --icon-name=spark-store --height 150 --width 200 --text "${TRANSHELL_CONTENT_CLOSING_UPGRADE_CHECK}" --timeout=2 pkexec systemctl disable spark-update-notifier - zenity --info --icon-name=spark-store --height 150 --width 200 --text "已关闭" --timeout=2 + zenity --info --icon-name=spark-store --height 150 --width 200 --text "${TRANSHELL_CONTENT_CLOSED}" --timeout=2 else - zenity --info --icon-name=spark-store --height 150 --width 200 --text "未检测到自动更新检测，执行启动" --timeout=2 + zenity --info --icon-name=spark-store --height 150 --width 200 --text "${TRANSHELL_CONTENT_OPENING_UPGRADE_CHECK}" --timeout=2 pkexec systemctl enable spark-update-notifier pkexec service spark-update-notifier start - zenity --info --icon-name=spark-store --height 150 --width 200 --text "已启动" --timeout=2 + zenity --info --icon-name=spark-store --height 150 --width 200 --text "${TRANSHELL_CONTENT_OPENED}" --timeout=2 fi ;; diff --git a/tool/update-upgrade/ss-update-notifier.sh b/tool/update-upgrade/ss-update-notifier.sh index fbb7e95..2992ea9 100755 --- a/tool/update-upgrade/ss-update-notifier.sh +++ b/tool/update-upgrade/ss-update-notifier.sh @@ -15,6 +15,17 @@ if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then echo "-----------------------------------------------------------------------------" } + +function update_transhell() +{ +WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +CURRENT_LANG="$(echo $LANG | cut -c -5)" +if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; fi +if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi +if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; fi +if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi + +} load_transhell ############################################################# @@ -117,7 +128,7 @@ IFS="$IFS_OLD" if [ $update_app_number -le 0 ] ; then exit 0 fi -load_transhell +update_transhell ## 如果都是hold或者版本一致的那就直接退出，否则把剩余的给提醒了 notify-send -a spark-store "${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_NOTIFY}" "${TRANSHELL_CONTENT_THERE_ARE_APPS_TO_UPGRADE}" diff --git a/tool/update-upgrade/transhell/ss-do-upgrade.sh_en_US.transhell b/tool/update-upgrade/transhell/ss-do-upgrade.sh_en_US.transhell new file mode 100644 index 0000000..fcc7422 --- /dev/null +++ b/tool/update-upgrade/transhell/ss-do-upgrade.sh_en_US.transhell @@ -0,0 +1,17 @@ +#!/bin/bash +TRANSHELL_CONTENT_UPDATE_CHEKING_PLEASE_WAIT="Checking for update, please wait..." +TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL="Spark Store APP Upgrade model" +TRANSHELL_CONTENT_CHECK_UPDATE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK="Error occured in checking for update! Press Confirm to get the error log (Can be useful when feedback)" +TRANSHELL_CONTENT_I_ALREDY_COPIED_THE_LOG_HERE_AND_WILL_USE_IT_TO_FEEDBACK="I already copied the log in the text box and I will attach it when feeding back. You can find feedback entry in the settings which is located in the top right of the store." +TRANSHELL_CONTENT_FEEDBACK_CAN_BE_FOUND_IN_THE_SETTINGS="Feedback entry in the settings which is located in the top right of the store" +TRANSHELL_CONTENT_NO_NEED_TO_UPGRADE="All APPs are up to date.\nBut you are not standing at the top of the world" +TRANSHELL_CONTENT_CAN_NOT_UPGRADE_FOR_BEING_HOLD="（Unable to upgrade: Being marked as hold）" +TRANSHELL_CONTENT_CHOOSE_APP_TO_UPGRADE="Choose the app you want to upgrade" +TRANSHELL_CONTENT_CHOOSE="Choose" +TRANSHELL_CONTENT_PKG_NAME="Pkg name" +TRANSHELL_CONTENT_NEW_VERSION="New version" +TRANSHELL_CONTENT_UPGRADE_FROM="Upgrade from" +TRANSHELL_CONTENT_NO_APP_IS_CHOSEN="No app is chosen\nBut you are not standing at the top of the world" +TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT="Upgrading $PKG_UPGRADE , please wait..." +TRANSHELL_CONTENT_CHOSEN_APP_UPGRADE_FINISHED="The chosen app is upgraded" +TRANSHELL_CONTENT_APP_UGRADE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK="Error occured when upgrading! Press Confirm to get the error log (Can be useful when feedback)" diff --git a/tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_CN.transhell b/tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_CN.transhell index 83d9d77..1a56aff 100644 --- a/tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_CN.transhell +++ b/tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_CN.transhell @@ -7,3 +7,11 @@ TRANSHELL_CONTENT_FEEDBACK_CAN_BE_FOUND_IN_THE_SETTINGS="反馈渠道在商店 TRANSHELL_CONTENT_NO_NEED_TO_UPGRADE="没有软件需要更新\n但是你并没有站在世界之巅" TRANSHELL_CONTENT_CAN_NOT_UPGRADE_FOR_BEING_HOLD="（无法更新：已被标记为保留）" TRANSHELL_CONTENT_CHOOSE_APP_TO_UPGRADE="选择你想更新的应用" +TRANSHELL_CONTENT_CHOOSE="选择" +TRANSHELL_CONTENT_PKG_NAME="包名" +TRANSHELL_CONTENT_NEW_VERSION="新版本" +TRANSHELL_CONTENT_UPGRADE_FROM="从该版本更新" +TRANSHELL_CONTENT_NO_APP_IS_CHOSEN="没有选中任何软件\n但是你并没有站在世界之巅" +TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT="正在更新 $PKG_UPGRADE ，请稍候..." +TRANSHELL_CONTENT_CHOSEN_APP_UPGRADE_FINISHED="选中的软件已经更新完毕" +TRANSHELL_CONTENT_APP_UGRADE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK="更新出现错误！按确定查看报错，可用于反馈" diff --git a/tool/update-upgrade/transhell/ss-update-controler.sh_en_US.transhell b/tool/update-upgrade/transhell/ss-update-controler.sh_en_US.transhell new file mode 100644 index 0000000..b46fd24 --- /dev/null +++ b/tool/update-upgrade/transhell/ss-update-controler.sh_en_US.transhell @@ -0,0 +1,12 @@ +#!/bin/bash +TRANSHELL_CONTENT_CLOSE="Close" +TRANSHELL_CONTENT_OPEN="Open" +TRANSHELL_CONTENT_WELCOME_AND_CHOOSE_ONE_TO_RUN="Welcome to Spark Store APP Upgrade Settings\nPlease choose one option to run" +TRANSHELL_CONTENT_OPTIONS="Options" +TRANSHELL_CONTENT_OPEN_OR_CLOSE_UPGRADE_CHECK="$text_update_open Spark Store APP upgrade check. (Will notify APP upgrade at start up if opened.)" +TRANSHELL_CONTENT_CHECK_FOR_UPDATE="Check Upgradable app list." +TRANSHELL_CONTENT_EXIT="Exit" +TRANSHELL_CONTENT_CLOSING_UPGRADE_CHECK="Please authorize to close APP upgrade check" +TRANSHELL_CONTENT_CLOSED="Closed" +TRANSHELL_CONTENT_OPENING_UPGRADE_CHECK="Please authorize to open APP upgrade check" +TRANSHELL_CONTENT_OPENED="Opened" diff --git a/tool/update-upgrade/transhell/ss-update-controler.sh_zh_CN.transhell b/tool/update-upgrade/transhell/ss-update-controler.sh_zh_CN.transhell new file mode 100644 index 0000000..091c198 --- /dev/null +++ b/tool/update-upgrade/transhell/ss-update-controler.sh_zh_CN.transhell @@ -0,0 +1,12 @@ +#!/bin/bash +TRANSHELL_CONTENT_CLOSE="关闭" +TRANSHELL_CONTENT_OPEN="开启" +TRANSHELL_CONTENT_WELCOME_AND_CHOOSE_ONE_TO_RUN="欢迎使用星火更新和安装设置工具\n请在以下操作中选择一个进行~" +TRANSHELL_CONTENT_OPTIONS="操作选项" +TRANSHELL_CONTENT_OPEN_OR_CLOSE_UPGRADE_CHECK="$text_update_open星火更新检测工具(如果开启则会在系统启动后自动检测更新。如有更新则会弹出通知)" +TRANSHELL_CONTENT_CHECK_FOR_UPDATE="查看可更新软件包列表" +TRANSHELL_CONTENT_EXIT="退出" +TRANSHELL_CONTENT_CLOSING_UPGRADE_CHECK="执行关闭自动更新检测，请授权" +TRANSHELL_CONTENT_CLOSED="已关闭" +TRANSHELL_CONTENT_OPENING_UPGRADE_CHECK="执行启动自动更新检测，请授权" +TRANSHELL_CONTENT_OPENED="已开启" From f629dca03c8d971bb4b13be173bef42cc2588b7d Mon Sep 17 00:00:00 2001 From: shenmo Date: Fri, 27 Jan 2023 12:26:51 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=88=B0usr/share?= =?UTF-8?q?=E6=9D=A5=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../usr/share/ssinstall}/transhell/ssinstall_en_US.transhell | 0 .../usr/share/ssinstall}/transhell/ssinstall_zh_CN.transhell | 0 spark-store-project.pro | 5 ++++- 3 files changed, 4 insertions(+), 1 deletion(-) rename {tool => pkg/usr/share/ssinstall}/transhell/ssinstall_en_US.transhell (100%) rename {tool => pkg/usr/share/ssinstall}/transhell/ssinstall_zh_CN.transhell (100%) diff --git a/tool/transhell/ssinstall_en_US.transhell b/pkg/usr/share/ssinstall/transhell/ssinstall_en_US.transhell similarity index 100% rename from tool/transhell/ssinstall_en_US.transhell rename to pkg/usr/share/ssinstall/transhell/ssinstall_en_US.transhell diff --git a/tool/transhell/ssinstall_zh_CN.transhell b/pkg/usr/share/ssinstall/transhell/ssinstall_zh_CN.transhell similarity index 100% rename from tool/transhell/ssinstall_zh_CN.transhell rename to pkg/usr/share/ssinstall/transhell/ssinstall_zh_CN.transhell diff --git a/spark-store-project.pro b/spark-store-project.pro index f0e92dd..3aeb087 100644 --- a/spark-store-project.pro +++ b/spark-store-project.pro @@ -48,6 +48,9 @@ polkit-1.path = /usr/share/polkit-1/actions/ icon.files += pkg/usr/share/icons/hicolor/scalable/apps/spark-store.svg icon.path = /usr/share/icons/hicolor/scalable/apps +ssinstall-transhell.files += pkg/usr/share/ssinstall/transhell +ssinstall-transhell.path = /usr/share/ssinstall/transhell + tmp.files += pkg/tmp/spark-store-install/feedback.sh tmp.path = /tmp/spark-store-install @@ -56,7 +59,7 @@ INSTALLS += \ qm \ desktop \ icon \ -# preferences \ + ssinstall-transhell \ # sourceslist \ tmp \ service \ From c243a30dec78f1d3d8db596c95dc6a75d8c18a53 Mon Sep 17 00:00:00 2001 From: shenmo Date: Fri, 27 Jan 2023 12:31:20 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E7=BF=BB=E8=AF=91=E6=96=87=E4=BB=B6=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spark-store-project.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spark-store-project.pro b/spark-store-project.pro index 3aeb087..b8f6ca9 100644 --- a/spark-store-project.pro +++ b/spark-store-project.pro @@ -49,7 +49,7 @@ icon.files += pkg/usr/share/icons/hicolor/scalable/apps/spark-store.svg icon.path = /usr/share/icons/hicolor/scalable/apps ssinstall-transhell.files += pkg/usr/share/ssinstall/transhell -ssinstall-transhell.path = /usr/share/ssinstall/transhell +ssinstall-transhell.path = /usr/share/ssinstall/ tmp.files += pkg/tmp/spark-store-install/feedback.sh tmp.path = /tmp/spark-store-install From 4359a9c58d553039f297bfe859f41be5d70ddbb2 Mon Sep 17 00:00:00 2001 From: shenmo Date: Fri, 27 Jan 2023 16:31:10 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=E4=BB=A3=E7=A0=81=20=E5=B0=86load=20transhel?= =?UTF-8?q?l=E7=9A=84=E5=8F=98=E9=87=8F=E6=94=B9=E4=B8=BAlocal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tool/ssinstall | 12 ++++-------- tool/update-upgrade/ss-do-upgrade.sh | 11 ++++------- tool/update-upgrade/ss-update-controler.sh | 11 ++++------- tool/update-upgrade/ss-update-notifier.sh | 11 +++++------ 4 files changed, 17 insertions(+), 28 deletions(-) diff --git a/tool/ssinstall b/tool/ssinstall index ff7a103..19c63eb 100755 --- a/tool/ssinstall +++ b/tool/ssinstall @@ -1,11 +1,10 @@ #!/bin/bash - ##load transhell function load_transhell() { -WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -CURRENT_LANG="$(echo $LANG | cut -c -5)" +local WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +local CURRENT_LANG="$(echo ${LANG%.*})" if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell ..."; fi if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell ..."; fi @@ -14,11 +13,10 @@ if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then echo "-----------------------------------------------------------------------------" } - function update_transhell() { -WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -CURRENT_LANG="$(echo $LANG | cut -c -5)" +local WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +local CURRENT_LANG="$(echo ${LANG%.*})" if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; fi if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; fi @@ -32,8 +30,6 @@ load_transhell - - echo "Spark Store Install script.星火商店安装脚本" function pkexec_as_current_user() { diff --git a/tool/update-upgrade/ss-do-upgrade.sh b/tool/update-upgrade/ss-do-upgrade.sh index 97fad77..1570fc2 100755 --- a/tool/update-upgrade/ss-do-upgrade.sh +++ b/tool/update-upgrade/ss-do-upgrade.sh @@ -1,11 +1,10 @@ #!/bin/bash - ##load transhell function load_transhell() { -WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -CURRENT_LANG="$(echo $LANG | cut -c -5)" +local WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +local CURRENT_LANG="$(echo ${LANG%.*})" if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell ..."; fi if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell ..."; fi @@ -14,11 +13,10 @@ if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then echo "-----------------------------------------------------------------------------" } - function update_transhell() { -WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -CURRENT_LANG="$(echo $LANG | cut -c -5)" +local WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +local CURRENT_LANG="$(echo ${LANG%.*})" if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; fi if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; fi @@ -28,7 +26,6 @@ if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then load_transhell - touch /tmp/spark-store/upgradeStatus.txt # 执行 apt update diff --git a/tool/update-upgrade/ss-update-controler.sh b/tool/update-upgrade/ss-update-controler.sh index 5c3fb6c..28f2e2f 100755 --- a/tool/update-upgrade/ss-update-controler.sh +++ b/tool/update-upgrade/ss-update-controler.sh @@ -1,12 +1,10 @@ #!/bin/bash - - ##load transhell function load_transhell() { -WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -CURRENT_LANG="$(echo $LANG | cut -c -5)" +local WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +local CURRENT_LANG="$(echo ${LANG%.*})" if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell ..."; fi if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell ..."; fi @@ -15,11 +13,10 @@ if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then echo "-----------------------------------------------------------------------------" } - function update_transhell() { -WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -CURRENT_LANG="$(echo $LANG | cut -c -5)" +local WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +local CURRENT_LANG="$(echo ${LANG%.*})" if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; fi if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; fi diff --git a/tool/update-upgrade/ss-update-notifier.sh b/tool/update-upgrade/ss-update-notifier.sh index 2992ea9..c02cd4e 100755 --- a/tool/update-upgrade/ss-update-notifier.sh +++ b/tool/update-upgrade/ss-update-notifier.sh @@ -1,12 +1,11 @@ #!/bin/bash LANGUAGE=en_US - ##load transhell function load_transhell() { -WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -CURRENT_LANG="$(echo $LANG | cut -c -5)" +local WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +local CURRENT_LANG="$(echo ${LANG%.*})" if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell ..."; fi if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell ..."; fi @@ -15,17 +14,17 @@ if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then echo "-----------------------------------------------------------------------------" } - function update_transhell() { -WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -CURRENT_LANG="$(echo $LANG | cut -c -5)" +local WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +local CURRENT_LANG="$(echo ${LANG%.*})" if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; fi if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; fi if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi } + load_transhell ############################################################# From 1266b16d835c3dae02d8c982eae6487c0626c32f Mon Sep 17 00:00:00 2001 From: shenmo Date: Fri, 27 Jan 2023 09:50:18 +0000 Subject: [PATCH 14/14] update debian/changelog. Signed-off-by: shenmo --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 69b5234..2c00065 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ spark-store (4.2.1) stable; urgency=medium - * 调整：支持在安装前进行测试（ss-do-upgrade-worker） + * 调整：支持在安装前进行测试（ss-do-upgrade-worker）,但是未实装到appinfo * 修复：因依赖不完全导致在LinuxMint下无法下载统计 * 新增：脚本系列应用支持英文