Commit a030dbb3 authored by Mikhail Tergoev's avatar Mikhail Tergoev

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

parents 1248cf03 9266de67
......@@ -1405,7 +1405,7 @@ check_nvidia_rtx () {
pw_init_db () {
if [[ -f "${portwine_exe}" ]] ; then
PORTWINE_DB="$(basename "${portwine_exe}" .exe)"
PORTWINE_DB="$(basename "${portwine_exe%.[Ee][Xx][Ee]}")"
export PORTWINE_DB
if echo "${PORTWINE_DB}" | grep -i "_vo_\|_gv_" &>/dev/null ; then
print_warning "Force use gamesvoice.ppdb file!"
......@@ -1747,7 +1747,7 @@ pw_create_gui_png () {
then
PORTPROTON_NAME="$PW_PRODUCTNAME"
else
PORTPROTON_NAME="$(basename "${portwine_exe}" .exe)"
PORTPROTON_NAME="$(basename "${portwine_exe%.[Ee][Xx][Ee]}")"
fi
fi
......@@ -3105,17 +3105,17 @@ portwine_launch () {
fi
case "$portwine_exe" in
*.exe)
*.[Ee][Xx][Ee])
pw_run ${PW_VD_TMP[@]} ${WINE_WIN_START} "$portwine_exe"
;;
*.bat)
*.[Bb][Aa][Tt])
PW_USE_TERMINAL=1
pw_run ${PW_VD_TMP[@]} cmd /c "$portwine_exe"
;;
*.msi)
*.[Mm][Ss][Ii])
pw_run ${PW_VD_TMP[@]} msiexec /i "$portwine_exe"
;;
*.reg)
*.[Rr][Ee][Gg])
pw_run ${PW_VD_TMP[@]} regedit "$portwine_exe"
;;
*)
......
......@@ -30,14 +30,14 @@ export orig_IFS="$IFS"
MISSING_DESKTOP_FILE="0"
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_DISABLED_CREATE_DB="1"
portwine_exe="$1"
elif [[ -f "$1" ]] ; then
portwine_exe="$(realpath "$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
portwine_exe="$(realpath "$OLDPWD/$1")"
elif [[ "$1" == "--debug" ]] \
......@@ -46,10 +46,10 @@ then
portwine_exe="$(realpath "$2")"
elif [[ "$1" == "--debug" ]] \
&& [[ -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
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
portwine_exe="$1"
MISSING_DESKTOP_FILE=1
......
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