From fe4327e39bd583a47dad36da3f6f883d3f8ccf67 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Tue, 24 Jun 2025 15:29:28 +0300 Subject: [PATCH] silent create desktop files then START_FROM_STEAM = 1 --- data_from_portwine/scripts/functions_helper | 32 ++++++++++++++------- data_from_portwine/scripts/start.sh | 5 +++- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 430fbc67..fe3ae741 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -6462,19 +6462,29 @@ portwine_create_shortcut () { } portwine_output_yad_shortcut () { - if [[ "$PW_YAD_OUT" == "0" ]] ; then - name_desktop=$(echo "$OUTPUT" | awk -F'|' '{print $1}' | sed -e "s/\`//g" -e "s/\"//g" -e "s/'//g" -e "s/\!//g") - PW_SHORTCUT_MENU=$(echo "$OUTPUT" | awk -F'|' '{print $2}') - PW_SHORTCUT_DESKTOP=$(echo "$OUTPUT" | awk -F'|' '{print $3}') - PW_SHORTCUT_STEAM=$(echo "$OUTPUT" | awk -F'|' '{print $4}') - - if [[ $PORTWINE_CHANGE_SHORTCUT != 1 ]] ; then - edit_user_conf_from_gui PW_SHORTCUT_MENU PW_SHORTCUT_DESKTOP PW_SHORTCUT_STEAM + if [[ $PW_YAD_OUT == "0" ]] || [[ $1 == "--silent" ]] ; then + if [[ $1 == "--silent" ]] ; then + [[ ! -e ${portwine_exe} ]] && return 1 + pw_create_gui_png + unset name_desktop + PW_SHORTCUT_MENU="TRUE" + PW_SHORTCUT_DESKTOP="TRUE" + PW_SHORTCUT_STEAM="FALSE" + else + name_desktop=$(echo "$OUTPUT" | awk -F'|' '{print $1}' | sed -e "s/\`//g" -e "s/\"//g" -e "s/'//g" -e "s/\!//g") + PW_SHORTCUT_MENU=$(echo "$OUTPUT" | awk -F'|' '{print $2}') + PW_SHORTCUT_DESKTOP=$(echo "$OUTPUT" | awk -F'|' '{print $3}') + PW_SHORTCUT_STEAM=$(echo "$OUTPUT" | awk -F'|' '{print $4}') + if [[ $PORTWINE_CHANGE_SHORTCUT != 1 ]] ; then + edit_user_conf_from_gui PW_SHORTCUT_MENU PW_SHORTCUT_DESKTOP PW_SHORTCUT_STEAM + fi + portwine_delete_shortcut fi - portwine_delete_shortcut - - [[ -z $name_desktop ]] && create_name_desktop && export name_desktop="$PW_NAME_DESKTOP_PROXY" + if [[ -z $name_desktop ]] ; then + create_name_desktop + export name_desktop="$PW_NAME_DESKTOP_PROXY" + fi echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Name=${name_desktop}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 4f08a7e8..e058e947 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -411,7 +411,10 @@ EOF while read -r line do export portwine_exe="$PORT_WINE_PATH/data/prefixes/$PW_PREFIX_NAME/$line" - portwine_create_shortcut + if [[ $START_FROM_STEAM == "1" ]] + then portwine_output_yad_shortcut --silent + else portwine_create_shortcut + fi done < "$PORT_WINE_PATH/data/prefixes/$PW_PREFIX_NAME/.create_shortcut" fi yad_info "${translations[Unpack is DONE for prefix:]} \"${PW_PREFIX_NAME}\"."