Commit ceaa7da2 authored by Vladislav's avatar Vladislav

Update PW_DESKTOP_FILES_REGEX

parent 8781ca6e
...@@ -5851,21 +5851,12 @@ button_click () { ...@@ -5851,21 +5851,12 @@ button_click () {
--desktop) --desktop)
kill -s SIGUSR1 $(pgrep -a yad | grep "\--key=${KEY_MENU}" | awk '{print $1}') > /dev/null 2>&1 kill -s SIGUSR1 $(pgrep -a yad | grep "\--key=${KEY_MENU}" | awk '{print $1}') > /dev/null 2>&1
PW_YAD_SET="${PORT_WINE_PATH}/${PW_YAD_SET//#@_@#/ }" PW_YAD_SET="${PORT_WINE_PATH}/${PW_YAD_SET//#@_@#/ }"
if [[ $PW_DESKTOP_FILES_REGEX == "1" ]] ; then if [[ -n $PW_DESKTOP_FILES_REGEX ]] ; then
PW_YAD_SET="${PW_YAD_SET//#+_1#/\(}" count=1
PW_YAD_SET="${PW_YAD_SET//#+_2#/\)}" for y in ${PW_DESKTOP_FILES_REGEX[@]} ; do
PW_YAD_SET="${PW_YAD_SET//#+_3#/\!}" PW_YAD_SET="${PW_YAD_SET//#+_$count#/$y}"
PW_YAD_SET="${PW_YAD_SET//#+_4#/\$}" (( count++ ))
PW_YAD_SET="${PW_YAD_SET//#+_5#/\%}" done
PW_YAD_SET="${PW_YAD_SET//#+_6#/\&}"
PW_YAD_SET="${PW_YAD_SET//#+_7#/\`}"
PW_YAD_SET="${PW_YAD_SET//#+_8#/\'}"
PW_YAD_SET="${PW_YAD_SET//#+_9#/\"}"
PW_YAD_SET="${PW_YAD_SET//#+_10#/\>}"
PW_YAD_SET="${PW_YAD_SET//#+_11#/\<}"
PW_YAD_SET="${PW_YAD_SET//#+_12#/\\}"
PW_YAD_SET="${PW_YAD_SET//#+_13#/\|}"
PW_YAD_SET="${PW_YAD_SET//#+_14#/\;}"
fi fi
if check_flatpak 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}')" 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}')"
......
...@@ -639,30 +639,21 @@ else ...@@ -639,30 +639,21 @@ else
resize_png "${PW_NAME_D_ICON_NEW}" "${PW_NAME_D_ICON_48//"${PORT_WINE_PATH}/data/img/"/}" "48" resize_png "${PW_NAME_D_ICON_NEW}" "${PW_NAME_D_ICON_48//"${PORT_WINE_PATH}/data/img/"/}" "48"
resize_png "${PW_NAME_D_ICON_NEW}" "${PW_NAME_D_ICON_128//"${PORT_WINE_PATH}/data/img/"/}" "128" resize_png "${PW_NAME_D_ICON_NEW}" "${PW_NAME_D_ICON_128//"${PORT_WINE_PATH}/data/img/"/}" "128"
fi fi
if [[ $PW_DESKTOP_FILES =~ [\(\)\!\$\%\&\`\'\"\>\<\\\|\;] ]] ; then
export PW_DESKTOP_FILES_REGEX="1"
PW_DESKTOP_FILES_SHOW="${PW_DESKTOP_FILES//\!/}"
PW_DESKTOP_FILES_SHOW="${PW_DESKTOP_FILES_SHOW//\%/}"
PW_DESKTOP_FILES_SHOW="${PW_DESKTOP_FILES_SHOW//\$/}"
PW_DESKTOP_FILES_SHOW="${PW_DESKTOP_FILES_SHOW//\&/}"
PW_DESKTOP_FILES_SHOW="${PW_DESKTOP_FILES_SHOW//\</}"
PW_DESKTOP_FILES="${PW_DESKTOP_FILES//\(/#+_1#}"
PW_DESKTOP_FILES="${PW_DESKTOP_FILES//\)/#+_2#}"
PW_DESKTOP_FILES="${PW_DESKTOP_FILES//\!/#+_3#}"
PW_DESKTOP_FILES="${PW_DESKTOP_FILES//\$/#+_4#}"
PW_DESKTOP_FILES="${PW_DESKTOP_FILES//\%/#+_5#}"
PW_DESKTOP_FILES="${PW_DESKTOP_FILES//\&/#+_6#}"
PW_DESKTOP_FILES="${PW_DESKTOP_FILES//\`/#+_7#}"
PW_DESKTOP_FILES="${PW_DESKTOP_FILES//\'/#+_8#}"
PW_DESKTOP_FILES="${PW_DESKTOP_FILES//\"/#+_9#}"
PW_DESKTOP_FILES="${PW_DESKTOP_FILES//\>/#+_10#}"
PW_DESKTOP_FILES="${PW_DESKTOP_FILES//\</#+_11#}"
PW_DESKTOP_FILES="${PW_DESKTOP_FILES//\\/#+_12#}"
PW_DESKTOP_FILES="${PW_DESKTOP_FILES//\|/#+_13#}"
PW_DESKTOP_FILES="${PW_DESKTOP_FILES//\;/#+_14#}"
else
PW_DESKTOP_FILES_SHOW="${PW_DESKTOP_FILES}" PW_DESKTOP_FILES_SHOW="${PW_DESKTOP_FILES}"
if [[ $PW_DESKTOP_FILES =~ [\(\)\!\$\%\&\`\'\"\>\<\\\|\;] ]] ; then
PW_DESKTOP_FILES_SHOW_REGEX=(\! % \$ \& \<)
PW_DESKTOP_FILES_REGEX=(\( \) \! \$ % \& \` \' \" \> \< \\ \| \;)
for i in ${PW_DESKTOP_FILES_SHOW_REGEX[@]} ; do
PW_DESKTOP_FILES_SHOW="${PW_DESKTOP_FILES_SHOW//$i/}"
done
count=1
for j in ${PW_DESKTOP_FILES_REGEX[@]} ; do
PW_DESKTOP_FILES="${PW_DESKTOP_FILES//$j/#+_$count#}"
(( count++ ))
done
fi fi
PW_GENERATE_BUTTONS+="--field= $(print_wrapped "${PW_DESKTOP_FILES_SHOW//".desktop"/""}" "25" "...")!${PW_NAME_D_ICON_48}.png!:FBTNR%@bash -c \"button_click --desktop "${PW_DESKTOP_FILES// /#@_@#}"\"%" PW_GENERATE_BUTTONS+="--field= $(print_wrapped "${PW_DESKTOP_FILES_SHOW//".desktop"/""}" "25" "...")!${PW_NAME_D_ICON_48}.png!:FBTNR%@bash -c \"button_click --desktop "${PW_DESKTOP_FILES// /#@_@#}"\"%"
done done
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment