From 1e9a9e3ea55945fe7da4756e383e505de2877d02 Mon Sep 17 00:00:00 2001 From: Htylol Date: Sun, 3 Nov 2024 23:10:43 +0500 Subject: [PATCH 1/2] Update for portwine_exe (only .exe,.bat,.msi,.reg) --- data_from_portwine/scripts/functions_helper | 8 ++--- data_from_portwine/scripts/start.sh | 34 +++++++++------------ 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 21876fff..a077f3a5 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -939,7 +939,7 @@ search_desktop_file () { # Ремонт, если есть пустые строки и непонятные строки без .exe, .bat, .msi, .reg if [[ $BROKEN_LINE == 1 ]] ; then while IFS=" " read -r -a line4 ; do - if [[ -n ${line4[0]} ]] && [[ ${line4[0]} =~ (.[Bb][Aa][Tt]$|.[Ee][Xx][Ee]$|.[Mm][Ss][Ii]$|.[Rr][Ee][Gg]$) ]] + if [[ -n ${line4[0]} ]] && [[ ${line4[0],,} =~ (.bat$|.exe$|.msi$|.reg$) ]] then echo "${line4[*]}" fi done < "$PORT_WINE_TMP_PATH/statistics" > "$PORT_WINE_TMP_PATH/statistics_repair" @@ -1475,20 +1475,20 @@ init_wine_ver () { export WINELOADER="${WINEDIR}/bin/wine" export WINESERVER="${WINEDIR}/bin/wineserver" if [[ -d "${WINEDIR}/files" && ! -d "${WINEDIR}/dist" ]] ; then - for clear_dist_files in $(ls "${WINEDIR}" | sed -e "s/^files$//g" | sed -e "s/^version$//g") ; do + for clear_dist_files in $(ls "${WINEDIR}" | sed -re "s/(^files$|^version$)//g") ; do rm -fr "${WINEDIR}/$clear_dist_files" done mv -f "${WINEDIR}/files"/* "${WINEDIR}/" rm -fr "${WINEDIR}/files" elif [[ ! -d "${WINEDIR}/files" && -d "${WINEDIR}/dist" ]] ; then - for clear_dist_files in $(ls "${WINEDIR}" | sed -e "s/^dist$//g" | sed -e "s/^version$//g") ; do + for clear_dist_files in $(ls "${WINEDIR}" | sed -re "s/(^dist$|^version$)//g") ; do rm -fr "${WINEDIR}/$clear_dist_files" done mv -f "${WINEDIR}/dist"/* "${WINEDIR}/" rm -fr "${WINEDIR}/dist" elif [[ -f "${WINEDIR}/proton_dist.tar" ]] ; then unpack "${WINEDIR}/proton_dist.tar" "${WINEDIR}/" - for clear_dist_files in $(ls "${WINEDIR}" | sed -e "s/^bin$//g" | sed -e "s/^lib$//g" | sed -e "s/^lib64$//g" | sed -e "s/^share$//g" | sed -e "s/^version$//g") ; do + for clear_dist_files in $(ls "${WINEDIR}" | sed -re "s/(^bin$|^lib$|^lib64$|^share$|^version$)//g") ; do rm -fr "${WINEDIR}/$clear_dist_files" done fi diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 793eb4c0..25b0fcfe 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -52,25 +52,21 @@ if [[ "${1,,}" =~ .ppack$ ]] ; then export PW_NO_RESTART_PPDB="1" export PW_DISABLED_CREATE_DB="1" portwine_exe="$1" -elif [[ -f "$1" ]] ; then - portwine_exe="$(realpath -s "$1")" -elif [[ -f "$OLDPWD/$1" ]] \ -&& [[ "${1,,}" =~ (.exe$|.bat$|.msi$|.reg$) ]] -then - portwine_exe="$(realpath -s "$OLDPWD/$1")" -elif [[ "$1" =~ (^--debug$|^--launch$|^--edit-db$) ]] \ -&& [[ -f "$2" ]] -then - portwine_exe="$(realpath -s "$2")" -elif [[ "$1" =~ (^--debug$|^--launch$|^--edit-db$) ]] \ -&& [[ -f "$OLDPWD/$2" ]] \ -&& [[ "${2,,}" =~ (.exe$|.bat$|.msi$|.reg$) ]] -then - portwine_exe="$(realpath -s "$OLDPWD/$2")" -elif [[ "${1,,}" =~ (.exe$|.bat$|.msi$|.reg$) ]] -then - portwine_exe="$1" - MISSING_DESKTOP_FILE="1" +elif [[ "${1,,}" =~ (.exe$|.bat$|.msi$|.reg$) ]] ; then + if [[ -f "$1" ]] ; then + portwine_exe="$(realpath -s "$1")" + elif [[ -f "$OLDPWD/$1" ]] ; then + portwine_exe="$(realpath -s "$OLDPWD/$1")" + elif [[ ! -f "$1" ]] ; then + portwine_exe="$1" + MISSING_DESKTOP_FILE="1" + fi +elif [[ "$1" =~ (^--debug$|^--launch$|^--edit-db$) && "${2,,}" =~ (.exe$|.bat$|.msi$|.reg$) ]] ; then + if [[ -f "$2" ]] ; then + portwine_exe="$(realpath -s "$2")" + elif [[ -f "$OLDPWD/$2" ]] ; then + portwine_exe="$(realpath -s "$OLDPWD/$2")" + fi fi export portwine_exe From c26ce5b2fef86a6ca1422c99bb37da4a570d1d29 Mon Sep 17 00:00:00 2001 From: Htylol Date: Thu, 7 Nov 2024 04:43:54 +0500 Subject: [PATCH 2/2] update --- data_from_portwine/scripts/functions_helper | 18 +++++++++--------- data_from_portwine/scripts/start.sh | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index a077f3a5..9c6a8471 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -904,7 +904,7 @@ search_desktop_file () { if [[ $DESKTOP_WITH_TIME == enabled ]] || [[ $SORT_WITH_TIME == enabled ]] ; then while IFS=" " read -r -a line2 ; do if [[ -z ${line2[0]} ]] \ - || [[ ! ${line2[0],,} =~ (.bat$|.exe$|.msi$|.reg$) ]] ; then + || [[ ! ${line2[0],,} =~ .(bat|exe|msi|reg)$ ]] ; then BROKEN_LINE=1 break fi @@ -939,7 +939,7 @@ search_desktop_file () { # Ремонт, если есть пустые строки и непонятные строки без .exe, .bat, .msi, .reg if [[ $BROKEN_LINE == 1 ]] ; then while IFS=" " read -r -a line4 ; do - if [[ -n ${line4[0]} ]] && [[ ${line4[0],,} =~ (.bat$|.exe$|.msi$|.reg$) ]] + if [[ -n ${line4[0]} ]] && [[ ${line4[0],,} =~ .(bat|exe|msi|reg)$ ]] then echo "${line4[*]}" fi done < "$PORT_WINE_TMP_PATH/statistics" > "$PORT_WINE_TMP_PATH/statistics_repair" @@ -1114,8 +1114,8 @@ create_name_desktop () { fi if (( ${#PORTWINE_DB_DESKTOP} > 3 )) ; then for ((i=0 ; i<${#PORTWINE_DB_DESKTOP} ; i++)) ; do - if [[ ${PORTWINE_DB_DESKTOP:i:2} =~ ([a-z][A-Z]|[a-z][0-9]) ]] \ - && [[ ! ${PORTWINE_DB_DESKTOP:i:3} =~ ([a-z][A-Z]" "|[a-z][0-9]" ") ]] ; then + if [[ ${PORTWINE_DB_DESKTOP:i:2} =~ [a-z]([A-Z]|[0-9]) ]] \ + && [[ ! ${PORTWINE_DB_DESKTOP:i:3} =~ [a-z]([A-Z]|[0-9])" " ]] ; then PORTWINE_DB_PROXY+="${PORTWINE_DB_DESKTOP:i:1} " elif [[ ${PORTWINE_DB_DESKTOP:i:3} =~ [0-9][0-9][a-zA-Z] ]] ; then PORTWINE_DB_PROXY+="${PORTWINE_DB_DESKTOP:i:2} " @@ -1475,20 +1475,20 @@ init_wine_ver () { export WINELOADER="${WINEDIR}/bin/wine" export WINESERVER="${WINEDIR}/bin/wineserver" if [[ -d "${WINEDIR}/files" && ! -d "${WINEDIR}/dist" ]] ; then - for clear_dist_files in $(ls "${WINEDIR}" | sed -re "s/(^files$|^version$)//g") ; do + for clear_dist_files in $(ls "${WINEDIR}" | sed -r "s/^(files|version)$//g") ; do rm -fr "${WINEDIR}/$clear_dist_files" done mv -f "${WINEDIR}/files"/* "${WINEDIR}/" rm -fr "${WINEDIR}/files" elif [[ ! -d "${WINEDIR}/files" && -d "${WINEDIR}/dist" ]] ; then - for clear_dist_files in $(ls "${WINEDIR}" | sed -re "s/(^dist$|^version$)//g") ; do + for clear_dist_files in $(ls "${WINEDIR}" | sed -r "s/^(dist|version)$//g") ; do rm -fr "${WINEDIR}/$clear_dist_files" done mv -f "${WINEDIR}/dist"/* "${WINEDIR}/" rm -fr "${WINEDIR}/dist" elif [[ -f "${WINEDIR}/proton_dist.tar" ]] ; then unpack "${WINEDIR}/proton_dist.tar" "${WINEDIR}/" - for clear_dist_files in $(ls "${WINEDIR}" | sed -re "s/(^bin$|^lib$|^lib64$|^share$|^version$)//g") ; do + for clear_dist_files in $(ls "${WINEDIR}" | sed -r "s/^(bin|lib|lib64|share|version)$//g") ; do rm -fr "${WINEDIR}/$clear_dist_files" done fi @@ -2729,7 +2729,7 @@ pw_create_gui_png () { fi fi - PORTPROTON_NAME="$(echo "${PORTPROTON_NAME}" | sed "s/\`//g" | sed "s/\"//g" | sed "s/'//g" | sed "s/\!//g")" + PORTPROTON_NAME="${PORTPROTON_NAME//(\`|\"|\'|\!)/})" export PORTPROTON_NAME edit_db_from_gui PORTPROTON_NAME FILE_DESCRIPTION fi @@ -5868,7 +5868,7 @@ portwine_output_yad_shortcut () { [[ "$PW_GUI_START" == "NOTEBOOK" ]] && unset PW_YAD_FORM_TAB restart_pp fi - elif [[ "$PW_YAD_OUT" =~ (^1$|^2$|^252$) ]] ; then + elif [[ "$PW_YAD_OUT" =~ ^(1|2|252)$ ]] ; then print_info "Restarting PP..." [[ -n $KEY_MENU ]] && unset portwine_exe [[ "$PW_GUI_START" == "NOTEBOOK" ]] && unset PW_YAD_FORM_TAB diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 25b0fcfe..a4d75f18 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -52,7 +52,7 @@ if [[ "${1,,}" =~ .ppack$ ]] ; then export PW_NO_RESTART_PPDB="1" export PW_DISABLED_CREATE_DB="1" portwine_exe="$1" -elif [[ "${1,,}" =~ (.exe$|.bat$|.msi$|.reg$) ]] ; then +elif [[ "${1,,}" =~ .(exe|bat|msi|reg)$ ]] ; then if [[ -f "$1" ]] ; then portwine_exe="$(realpath -s "$1")" elif [[ -f "$OLDPWD/$1" ]] ; then @@ -61,7 +61,7 @@ elif [[ "${1,,}" =~ (.exe$|.bat$|.msi$|.reg$) ]] ; then portwine_exe="$1" MISSING_DESKTOP_FILE="1" fi -elif [[ "$1" =~ (^--debug$|^--launch$|^--edit-db$) && "${2,,}" =~ (.exe$|.bat$|.msi$|.reg$) ]] ; then +elif [[ "$1" =~ ^--(debug|launch|edit-db)$ && "${2,,}" =~ .(exe|bat|msi|reg)$ ]] ; then if [[ -f "$2" ]] ; then portwine_exe="$(realpath -s "$2")" elif [[ -f "$OLDPWD/$2" ]] ; then