From 9718f831225b75c8d51418f23f9739c2fa4a2106 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Sun, 29 Sep 2024 21:01:42 +0300 Subject: [PATCH] more fixes for gamescope session --- data_from_portwine/scripts/functions_helper | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 7b2d491..58a9d18 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -473,9 +473,9 @@ try_download () { # If gamescope session is active, use PW_TERM for downloading if check_gamescope_session ; then - $PW_TERM "echo "Download $filename from ${FIRST_URL[0]}. Please wait!" \ + $PW_TERM "echo ; echo ; echo \"Download $filename from ${FIRST_URL[0]}. Please wait...\" \ ; curl -f -# -A 'Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)' -H 'Cache-Control: no-cache, no-store' \ - -H 'Pragma: no-cache' -L ${FIRST_URL[@]} -o $dest" + -H 'Pragma: no-cache' -L ${FIRST_URL[@]} -o \"$dest\"" [[ "$?" != 0 ]] && return 1 || return 0 fi @@ -721,11 +721,9 @@ unpack () { # If gamescope session is active, use PW_TERM for unpack if check_gamescope_session ; then - $PW_TERM "echo "Unpacking file: $1. Please wait!" ; $command "$1" -C "$2"" + $PW_TERM "echo ; echo ; echo \"Unpacking file: $1. Please wait...\" ; $command -v \"$1\" -C \"$2\"" [[ "$?" != 0 ]] && return 1 || return 0 - fi - - if [[ "$silent" != "true" ]] ; then + elif [[ "$silent" != "true" ]] ; then set -o pipefail pw_start_progress_bar_cover_block "${COVERS_PATH}/unpacking_${LANGUAGE_GIF}.gif" $command "$1" -C "$2" 2>/dev/null