diff --git a/tool/ssaudit b/tool/ssaudit index 7bb11da..634cb7b 100755 --- a/tool/ssaudit +++ b/tool/ssaudit @@ -2,6 +2,7 @@ source /opt/durapps/spark-store/bin/bashimport/transhell.amber load_transhell_debug +export DEBIAN_FRONTEND=noninteractive case $(arch) in x86_64) @@ -122,7 +123,7 @@ DEBPATH=$(realpath "$1") exit "$try_run_ret" fi - dpkg -i "$DEBPATH" || aptss install -yf + aptss install "$DEBPATH" -yf --reinstall if [ "$?" = "0" ] && [ "$2" = "--delete-after-install" ]; then if dpkg -s "$package_name" >/dev/null 2>&1; then diff --git a/tool/ssinstall b/tool/ssinstall index 0ea2124..2f1fcb3 100755 --- a/tool/ssinstall +++ b/tool/ssinstall @@ -2,7 +2,9 @@ source /opt/durapps/spark-store/bin/bashimport/transhell.amber load_transhell_debug +export DEBIAN_FRONTEND=noninteractive +trap 'unlock_file $DEBPATH' EXIT case $(arch) in x86_64) STORE_URL="store" @@ -164,7 +166,7 @@ if [ ! -z "$IS_SHA512SUM_CHECKED" ]; then exit "$try_run_ret" fi - dpkg -i "$DEBPATH" || aptss install -yf + aptss install "$DEBPATH" -yf --reinstall unlock_file "$DEBPATH" diff --git a/tool/store-helper/ss-launcher b/tool/store-helper/ss-launcher index edadb7f..a347a3d 100755 --- a/tool/store-helper/ss-launcher +++ b/tool/store-helper/ss-launcher @@ -54,6 +54,7 @@ unset desktop_file_path } + function scan_desktop_file(){ unset desktop_file_path local result="" diff --git a/tool/update-upgrade/ss-do-upgrade-worker.sh b/tool/update-upgrade/ss-do-upgrade-worker.sh index 1bdf4d6..75c0f89 100755 --- a/tool/update-upgrade/ss-do-upgrade-worker.sh +++ b/tool/update-upgrade/ss-do-upgrade-worker.sh @@ -1,6 +1,6 @@ #!/bin/bash -export LANGUAGE=en_US - +export LANGUAGE=en_US +export DEBIAN_FRONTEND=noninteractive case $1 in ssupdate) if [ "$(id -u)" != "0" ] ; then diff --git a/tool/update-upgrade/ss-do-upgrade.sh b/tool/update-upgrade/ss-do-upgrade.sh index 72be27a..2b72ba4 100755 --- a/tool/update-upgrade/ss-do-upgrade.sh +++ b/tool/update-upgrade/ss-do-upgrade.sh @@ -7,7 +7,6 @@ trap "rm -f /tmp/spark-store/upgradeStatus.txt" EXIT source /opt/durapps/spark-store/bin/bashimport/transhell.amber load_transhell_debug - function get_name_from_desktop_file() { local app_name_in_desktop local name_orig