From 8ca1ae91fa97809ccb49b18c7f0ccd50525365a5 Mon Sep 17 00:00:00 2001
From: Htylol <dixperm909@yandex.ru>
Date: Thu, 24 Oct 2024 03:28:26 +0500
Subject: [PATCH 1/2] Updates for name_desktop and create_pw_comment
---
data_from_portwine/scripts/functions_helper | 45 +++++++++++----------
1 file changed, 24 insertions(+), 21 deletions(-)
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index e78de9ac..0425ba03 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -908,30 +908,31 @@ search_desktop_file () {
create_pw_comment () {
search_desktop_file
unset DESKTOP_NAME_FILE PW_SHORTCUT_PROXY
- if [[ -n ${DESKTOP_FILES_ARRAY[0]} ]] ; then
- for df in "${DESKTOP_FILES_ARRAY[@]}" ; do
- df="${df//"$PORT_WINE_PATH/"/}"
- DESKTOP_NAME_FILE="${df//.desktop/}"
- done
+ if [[ -n $DESKTOP_NAME_YAD ]] ; then
+ DESKTOP_NAME_FILE="${DESKTOP_NAME_YAD//.desktop/}"
+ unset DESKTOP_NAME_YAD
+ elif [[ -n $name_desktop ]] ; then
+ DESKTOP_NAME_FILE="$name_desktop"
+ unset name_desktop
+ elif [[ -n ${DESKTOP_FILES_ARRAY[0]} ]] \
+ && [[ -z ${DESKTOP_FILES_ARRAY[1]} ]] ; then
+ DESKTOP_NAME_FILE="${DESKTOP_FILES_ARRAY[0]//"$PORT_WINE_PATH/"/}"
+ DESKTOP_NAME_FILE="${DESKTOP_NAME_FILE//.desktop/}"
fi
if [[ -z "${PW_COMMENT_DB}" ]] ; then
- [[ $FILE_DESCRIPTION != "" ]] && FILE_DESCRIPTION_ABBR=$(make_abbreviation "$FILE_DESCRIPTION")
- [[ $PORTPROTON_NAME != "" ]] && PORTPROTON_NAME_ABBR=$(make_abbreviation "$PORTPROTON_NAME")
- if [[ -n $DESKTOP_NAME_FILE ]] && [[ $DESKTOP_NAME_FILE != "" ]] ; then
+ [[ -n $PORTPROTON_NAME ]] && PORTPROTON_NAME_ABBR=$(make_abbreviation "$PORTPROTON_NAME")
+ [[ -n $FILE_DESCRIPTION ]] && FILE_DESCRIPTION_ABBR=$(make_abbreviation "$FILE_DESCRIPTION")
+ if [[ -n $DESKTOP_NAME_FILE ]] ; then
PW_COMMENT_DB="${translations[Launching]} <b>$(print_wrapped "$DESKTOP_NAME_FILE" "50")</b>$(seconds_to_time "$TIME_CURRENT")"
PW_SHORTCUT_PROXY="$DESKTOP_NAME_FILE"
- elif [[ ${PORTPROTON_NAME^^} =~ ${PORTWINE_DB^^} ]] && [[ ${PORTPROTON_NAME^^} != "${PORTWINE_DB^^}" ]] ; then
- PW_COMMENT_DB="${translations[Launching]} <b>$(print_wrapped "$PORTPROTON_NAME" "50")</b>$(seconds_to_time "$TIME_CURRENT")"
- PW_SHORTCUT_PROXY="$PORTPROTON_NAME"
- elif (( ${#PORTPROTON_NAME_ABBR} > 2 )) && [[ ${PORTPROTON_NAME_ABBR^^} =~ ${PORTWINE_DB^^} ]] ; then
- PW_COMMENT_DB="${translations[Launching]} <b>$(print_wrapped "$PORTPROTON_NAME" "50")</b>$(seconds_to_time "$TIME_CURRENT")"
- PW_SHORTCUT_PROXY="$PORTPROTON_NAME"
- elif [[ ${FILE_DESCRIPTION^^} =~ ${PORTWINE_DB^^} ]] && [[ ${FILE_DESCRIPTION^^} != "${PORTWINE_DB^^}" ]] ; then
- PW_COMMENT_DB="${translations[Launching]} <b>$(print_wrapped "$FILE_DESCRIPTION" "50")</b>$(seconds_to_time "$TIME_CURRENT")"
- PW_SHORTCUT_PROXY="$FILE_DESCRIPTION"
- elif (( ${#FILE_DESCRIPTION_ABBR} > 2 )) && [[ ${FILE_DESCRIPTION_ABBR^^} =~ ${PORTWINE_DB^^} ]] ; then
- PW_COMMENT_DB="${translations[Launching]} <b>$(print_wrapped "$FILE_DESCRIPTION" "50")</b>$(seconds_to_time "$TIME_CURRENT")"
- PW_SHORTCUT_PROXY="$FILE_DESCRIPTION"
+ elif [[ ${PORTPROTON_NAME^^} =~ ${PORTWINE_DB^^} && ${PORTPROTON_NAME} != "${PORTWINE_DB}" ]] \
+ || [[ ${#PORTPROTON_NAME_ABBR} -gt 2 && ${PORTPROTON_NAME_ABBR^^} =~ ${PORTWINE_DB^^} ]] ; then
+ PW_COMMENT_DB="${translations[Launching]} <b>$(print_wrapped "$PORTPROTON_NAME" "50")</b>$(seconds_to_time "$TIME_CURRENT")"
+ PW_SHORTCUT_PROXY="$PORTPROTON_NAME"
+ elif [[ ${FILE_DESCRIPTION^^} =~ ${PORTWINE_DB^^} && ${FILE_DESCRIPTION} != "${PORTWINE_DB}" ]] \
+ || [[ ${#FILE_DESCRIPTION_ABBR} -gt 2 && ${FILE_DESCRIPTION_ABBR^^} =~ ${PORTWINE_DB^^} ]] ; then
+ PW_COMMENT_DB="${translations[Launching]} <b>$(print_wrapped "$FILE_DESCRIPTION" "50")</b>$(seconds_to_time "$TIME_CURRENT")"
+ PW_SHORTCUT_PROXY="$FILE_DESCRIPTION"
else
unset PORTWINE_DB_PROXY PORTWINE_DB_NEW
PORTWINE_DB="${PORTWINE_DB//_/ }"
@@ -5588,12 +5589,13 @@ portwine_create_shortcut () {
for rm in "${DESKTOP_FILES_ARRAY[@]}" ; do
rm -f "$rm"
done
- [[ $name_desktop == "" ]] && create_pw_comment && export name_desktop="$PW_SHORTCUT_PROXY"
fi
else
try_remove_file "${PORT_WINE_PATH}/${name_desktop}.desktop"
fi
+ [[ -z $name_desktop ]] && unset name_desktop && export name_desktop="$DESKTOP_NAME_FILE"
+
echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop"
echo "Name=${name_desktop}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop"
if check_flatpak
@@ -6178,6 +6180,7 @@ button_click () {
(( count++ ))
done
fi
+ export DESKTOP_NAME_YAD="${PW_YAD_SET//"$PORT_WINE_PATH/"/}"
if check_flatpak
then PW_EXEC_FROM_DESKTOP="$(grep Exec "$PW_YAD_SET" | head -n 1 | sed 's|flatpak run ru.linux_gaming.PortProton|\"${PORT_SCRIPTS_PATH}/start.sh\"|' | awk -F'=' '{print $2}')"
else PW_EXEC_FROM_DESKTOP="$(grep Exec "$PW_YAD_SET" | head -n 1 | awk -F"=env " '{print $2}')"
From 9fb5fb25f73d4afb8f93afa1729f57d063b48129 Mon Sep 17 00:00:00 2001
From: Htylol <dixperm909@yandex.ru>
Date: Thu, 24 Oct 2024 14:30:00 +0500
Subject: [PATCH 2/2] Replace == on -z
---
data_from_portwine/scripts/functions_helper | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index 0425ba03..a15f4aef 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -267,7 +267,7 @@ EOF
while [[ ! $line =~ msgid ]] ; do
msgstr+=$line
read -r line
- if [[ $line == "" ]] ; then
+ if [[ -z $line ]] ; then
break
fi
done
@@ -756,8 +756,8 @@ background_pid () {
export bg_pid"${arg3}"="$PID" ;;
--end)
PID=$(get_bg_pid bg_pid"${arg3}")
- [[ $PID == "" ]] && return 1
- wait "$PID" && return 0 ;;
+ [[ -z $PID ]] && return 1
+ wait "$PID" 2>/dev/null && return 0 ;;
esac
fi
}
@@ -927,12 +927,12 @@ create_pw_comment () {
PW_SHORTCUT_PROXY="$DESKTOP_NAME_FILE"
elif [[ ${PORTPROTON_NAME^^} =~ ${PORTWINE_DB^^} && ${PORTPROTON_NAME} != "${PORTWINE_DB}" ]] \
|| [[ ${#PORTPROTON_NAME_ABBR} -gt 2 && ${PORTPROTON_NAME_ABBR^^} =~ ${PORTWINE_DB^^} ]] ; then
- PW_COMMENT_DB="${translations[Launching]} <b>$(print_wrapped "$PORTPROTON_NAME" "50")</b>$(seconds_to_time "$TIME_CURRENT")"
- PW_SHORTCUT_PROXY="$PORTPROTON_NAME"
+ PW_COMMENT_DB="${translations[Launching]} <b>$(print_wrapped "$PORTPROTON_NAME" "50")</b>$(seconds_to_time "$TIME_CURRENT")"
+ PW_SHORTCUT_PROXY="$PORTPROTON_NAME"
elif [[ ${FILE_DESCRIPTION^^} =~ ${PORTWINE_DB^^} && ${FILE_DESCRIPTION} != "${PORTWINE_DB}" ]] \
|| [[ ${#FILE_DESCRIPTION_ABBR} -gt 2 && ${FILE_DESCRIPTION_ABBR^^} =~ ${PORTWINE_DB^^} ]] ; then
- PW_COMMENT_DB="${translations[Launching]} <b>$(print_wrapped "$FILE_DESCRIPTION" "50")</b>$(seconds_to_time "$TIME_CURRENT")"
- PW_SHORTCUT_PROXY="$FILE_DESCRIPTION"
+ PW_COMMENT_DB="${translations[Launching]} <b>$(print_wrapped "$FILE_DESCRIPTION" "50")</b>$(seconds_to_time "$TIME_CURRENT")"
+ PW_SHORTCUT_PROXY="$FILE_DESCRIPTION"
else
unset PORTWINE_DB_PROXY PORTWINE_DB_NEW
PORTWINE_DB="${PORTWINE_DB//_/ }"
@@ -1016,10 +1016,10 @@ seconds_to_time () {
if [[ $minutes =~ ^0$ ]] ; then
hours=${hours//" ${translations[and]} "/}
minutes=
- if [[ $days == "" ]] || [[ $hours == "" ]] ; then
+ if [[ -z $days ]] || [[ -z $hours ]] ; then
days=${days//","/}
fi
- if [[ $days == "" ]] && [[ $hours == "" ]] ; then
+ if [[ -z $days ]] && [[ -z $hours ]] ; then
minutes="${translations[less than a minute]}"
fi
elif [[ $minutes =~ ^1$ ]] ; then