From 50e895938b1ab5bd67349ecc03e2e4df2bc9abbf Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Mon, 30 Jan 2023 13:19:07 +0800
Subject: [PATCH] =?UTF-8?q?transhell=E6=94=B9=E4=B8=BA=E7=94=A8source?=
 =?UTF-8?q?=E5=BC=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 debian/changelog                           |  7 +++++
 src/main.cpp                               |  2 +-
 tool/bashimport/transhell.amber            | 31 ++++++++++++++++++++++
 tool/ssinstall                             | 27 ++-----------------
 tool/update-upgrade/ss-do-upgrade.sh       | 26 ++----------------
 tool/update-upgrade/ss-update-controler.sh | 27 ++-----------------
 tool/update-upgrade/ss-update-notifier.sh  | 27 ++-----------------
 7 files changed, 47 insertions(+), 100 deletions(-)
 create mode 100755 tool/bashimport/transhell.amber

diff --git a/debian/changelog b/debian/changelog
index 2c00065..4b97fc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+spark-store (4.2.2) stable; urgency=medium
+
+  * 调整：脚本应用的transhell支持转为source
+
+ --shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
 spark-store (4.2.1) stable; urgency=medium
 
   * 调整：支持在安装前进行测试（ss-do-upgrade-worker）,但是未实装到appinfo
diff --git a/src/main.cpp b/src/main.cpp
index c52ffab..100922a 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.1";
+    static const QString version = "4.2.2";
     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/bashimport/transhell.amber b/tool/bashimport/transhell.amber
new file mode 100755
index 0000000..73b8d90
--- /dev/null
+++ b/tool/bashimport/transhell.amber
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+##load transhell
+function load_transhell_debug()
+{
+local WORK_PATH="$(cd "$(dirname "${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
+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 load_transhell()
+{
+local WORK_PATH="$(cd "$(dirname "${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
+
+}
+
+function update_transhell()
+{
+load_transhell $@
+}
+
diff --git a/tool/ssinstall b/tool/ssinstall
index 19c63eb..d879f0f 100755
--- a/tool/ssinstall
+++ b/tool/ssinstall
@@ -1,30 +1,7 @@
 #!/bin/bash
 
-##load transhell
-function load_transhell()
-{
-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
-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()
-{
-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
+source /opt/durapps/spark-store/bin/bashimport/transhell.amber
+load_transhell_debug
 
 
 
diff --git a/tool/update-upgrade/ss-do-upgrade.sh b/tool/update-upgrade/ss-do-upgrade.sh
index 1570fc2..d9e000d 100755
--- a/tool/update-upgrade/ss-do-upgrade.sh
+++ b/tool/update-upgrade/ss-do-upgrade.sh
@@ -1,30 +1,8 @@
 #!/bin/bash
 
-##load transhell
-function load_transhell()
-{
-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
-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
+source /opt/durapps/spark-store/bin/bashimport/transhell.amber
+load_transhell_debug
 
-echo "-----------------------------------------------------------------------------"
-}
-
-function update_transhell()
-{
-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
 
 touch /tmp/spark-store/upgradeStatus.txt
 
diff --git a/tool/update-upgrade/ss-update-controler.sh b/tool/update-upgrade/ss-update-controler.sh
index 28f2e2f..7546b37 100755
--- a/tool/update-upgrade/ss-update-controler.sh
+++ b/tool/update-upgrade/ss-update-controler.sh
@@ -1,30 +1,7 @@
 #!/bin/bash
 
-##load transhell
-function load_transhell()
-{
-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
-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()
-{
-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
+source /opt/durapps/spark-store/bin/bashimport/transhell.amber
+load_transhell_debug
 
 endloop=0
 
diff --git a/tool/update-upgrade/ss-update-notifier.sh b/tool/update-upgrade/ss-update-notifier.sh
index c02cd4e..61b883c 100755
--- a/tool/update-upgrade/ss-update-notifier.sh
+++ b/tool/update-upgrade/ss-update-notifier.sh
@@ -1,31 +1,8 @@
 #!/bin/bash
 LANGUAGE=en_US
 
-##load transhell
-function load_transhell()
-{
-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
-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()
-{
-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
+source /opt/durapps/spark-store/bin/bashimport/transhell.amber
+load_transhell_debug
 
 #############################################################