mirror of
https://gitee.com/spark-store-project/spark-store
synced 2025-07-03 20:26:00 +08:00
transhell改为用source引入
This commit is contained in:
parent
18d2b1edbb
commit
50e895938b
7
debian/changelog
vendored
7
debian/changelog
vendored
@ -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
|
spark-store (4.2.1) stable; urgency=medium
|
||||||
|
|
||||||
* 调整:支持在安装前进行测试(ss-do-upgrade-worker),但是未实装到appinfo
|
* 调整:支持在安装前进行测试(ss-do-upgrade-worker),但是未实装到appinfo
|
||||||
|
@ -15,7 +15,7 @@ DWIDGET_USE_NAMESPACE
|
|||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
// Get build time
|
// 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 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 QTime buildTime = QTime::fromString(__TIME__, "hh:mm:ss");
|
||||||
static const QString buildDateTime = buildDate.toString("yyyy.MM.dd") + "-" + buildTime.toString("hh:mm:ss");
|
static const QString buildDateTime = buildDate.toString("yyyy.MM.dd") + "-" + buildTime.toString("hh:mm:ss");
|
||||||
|
31
tool/bashimport/transhell.amber
Executable file
31
tool/bashimport/transhell.amber
Executable file
@ -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 $@
|
||||||
|
}
|
||||||
|
|
@ -1,30 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
##load transhell
|
source /opt/durapps/spark-store/bin/bashimport/transhell.amber
|
||||||
function load_transhell()
|
load_transhell_debug
|
||||||
{
|
|
||||||
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
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,30 +1,8 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
##load transhell
|
source /opt/durapps/spark-store/bin/bashimport/transhell.amber
|
||||||
function load_transhell()
|
load_transhell_debug
|
||||||
{
|
|
||||||
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
|
|
||||||
|
|
||||||
touch /tmp/spark-store/upgradeStatus.txt
|
touch /tmp/spark-store/upgradeStatus.txt
|
||||||
|
|
||||||
|
@ -1,30 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
##load transhell
|
source /opt/durapps/spark-store/bin/bashimport/transhell.amber
|
||||||
function load_transhell()
|
load_transhell_debug
|
||||||
{
|
|
||||||
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
|
|
||||||
|
|
||||||
endloop=0
|
endloop=0
|
||||||
|
|
||||||
|
@ -1,31 +1,8 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
LANGUAGE=en_US
|
LANGUAGE=en_US
|
||||||
|
|
||||||
##load transhell
|
source /opt/durapps/spark-store/bin/bashimport/transhell.amber
|
||||||
function load_transhell()
|
load_transhell_debug
|
||||||
{
|
|
||||||
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
|
|
||||||
|
|
||||||
#############################################################
|
#############################################################
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user