Merge branch 'Htylol-added-upper-case' into devel

This commit is contained in:
Mikhail Tergoev 2024-08-22 15:00:27 +03:00
commit a030dbb336
2 changed files with 10 additions and 10 deletions

@ -1405,7 +1405,7 @@ check_nvidia_rtx () {
pw_init_db () { pw_init_db () {
if [[ -f "${portwine_exe}" ]] ; then if [[ -f "${portwine_exe}" ]] ; then
PORTWINE_DB="$(basename "${portwine_exe}" .exe)" PORTWINE_DB="$(basename "${portwine_exe%.[Ee][Xx][Ee]}")"
export PORTWINE_DB export PORTWINE_DB
if echo "${PORTWINE_DB}" | grep -i "_vo_\|_gv_" &>/dev/null ; then if echo "${PORTWINE_DB}" | grep -i "_vo_\|_gv_" &>/dev/null ; then
print_warning "Force use gamesvoice.ppdb file!" print_warning "Force use gamesvoice.ppdb file!"
@ -1747,7 +1747,7 @@ pw_create_gui_png () {
then then
PORTPROTON_NAME="$PW_PRODUCTNAME" PORTPROTON_NAME="$PW_PRODUCTNAME"
else else
PORTPROTON_NAME="$(basename "${portwine_exe}" .exe)" PORTPROTON_NAME="$(basename "${portwine_exe%.[Ee][Xx][Ee]}")"
fi fi
fi fi
@ -3105,17 +3105,17 @@ portwine_launch () {
fi fi
case "$portwine_exe" in case "$portwine_exe" in
*.exe) *.[Ee][Xx][Ee])
pw_run ${PW_VD_TMP[@]} ${WINE_WIN_START} "$portwine_exe" pw_run ${PW_VD_TMP[@]} ${WINE_WIN_START} "$portwine_exe"
;; ;;
*.bat) *.[Bb][Aa][Tt])
PW_USE_TERMINAL=1 PW_USE_TERMINAL=1
pw_run ${PW_VD_TMP[@]} cmd /c "$portwine_exe" pw_run ${PW_VD_TMP[@]} cmd /c "$portwine_exe"
;; ;;
*.msi) *.[Mm][Ss][Ii])
pw_run ${PW_VD_TMP[@]} msiexec /i "$portwine_exe" pw_run ${PW_VD_TMP[@]} msiexec /i "$portwine_exe"
;; ;;
*.reg) *.[Rr][Ee][Gg])
pw_run ${PW_VD_TMP[@]} regedit "$portwine_exe" pw_run ${PW_VD_TMP[@]} regedit "$portwine_exe"
;; ;;
*) *)

@ -30,14 +30,14 @@ export orig_IFS="$IFS"
MISSING_DESKTOP_FILE="0" MISSING_DESKTOP_FILE="0"
unset PW_NO_RESTART_PPDB PW_DISABLED_CREATE_DB unset PW_NO_RESTART_PPDB PW_DISABLED_CREATE_DB
if [[ "$1" == *.ppack ]] ; then if [[ "$1" == *.[Pp][Pp][Aa][Cc][Kk] ]] ; then
export PW_NO_RESTART_PPDB="1" export PW_NO_RESTART_PPDB="1"
export PW_DISABLED_CREATE_DB="1" export PW_DISABLED_CREATE_DB="1"
portwine_exe="$1" portwine_exe="$1"
elif [[ -f "$1" ]] ; then elif [[ -f "$1" ]] ; then
portwine_exe="$(realpath "$1")" portwine_exe="$(realpath "$1")"
elif [[ -f "$OLDPWD/$1" ]] \ elif [[ -f "$OLDPWD/$1" ]] \
&& [[ "$1" == *.exe || "$1" == *.bat || "$1" == *.reg || "$1" == *.msi ]] && [[ "$1" == *.[Ee][Xx][Ee] || "$1" == *.[Bb][Aa][Tt] || "$1" == *.[Rr][Ee][Gg] || "$1" == *.[Mm][Ss][Ii] ]]
then then
portwine_exe="$(realpath "$OLDPWD/$1")" portwine_exe="$(realpath "$OLDPWD/$1")"
elif [[ "$1" == "--debug" ]] \ elif [[ "$1" == "--debug" ]] \
@ -46,10 +46,10 @@ then
portwine_exe="$(realpath "$2")" portwine_exe="$(realpath "$2")"
elif [[ "$1" == "--debug" ]] \ elif [[ "$1" == "--debug" ]] \
&& [[ -f "$OLDPWD/$2" ]] \ && [[ -f "$OLDPWD/$2" ]] \
&& [[ "$2" == *.exe || "$2" == *.bat || "$2" == *.reg || "$2" == *.msi ]] && [[ "$2" == *.[Ee][Xx][Ee] || "$2" == *.[Bb][Aa][Tt] || "$2" == *.[Rr][Ee][Gg] || "$2" == *.[Mm][Ss][Ii] ]]
then then
portwine_exe="$(realpath "$OLDPWD/$2")" portwine_exe="$(realpath "$OLDPWD/$2")"
elif [[ "$1" == *.exe || "$1" == *.bat || "$1" == *.msi || "$1" == *.reg ]] elif [[ "$1" == *.[Ee][Xx][Ee] || "$1" == *.[Bb][Aa][Tt] || "$1" == *.[Mm][Ss][Ii] || "$1" == *.[Rr][Ee][Gg] ]]
then then
portwine_exe="$1" portwine_exe="$1"
MISSING_DESKTOP_FILE=1 MISSING_DESKTOP_FILE=1