Merge branch 'cli-func1' of github.com:Htylol/PortWINE into Htylol-cli-func1
This commit is contained in:
commit
4580894721
@ -63,6 +63,21 @@ export -f make_abbreviation
|
|||||||
|
|
||||||
check_variables () { [[ -z ${!1} ]] && export $1="$2" ;}
|
check_variables () { [[ -z ${!1} ]] && export $1="$2" ;}
|
||||||
|
|
||||||
|
# Эксортирует несколько переменных за один раз (одной командой)
|
||||||
|
# и создаёт список этих переменных в $keys_all
|
||||||
|
# К примеру set_several_variables PW_MANGOHUD=1 PW_VKBASALT=0
|
||||||
|
set_several_variables () {
|
||||||
|
local key value
|
||||||
|
unset keys_all
|
||||||
|
while (( $# > 0 )) ; do
|
||||||
|
key=${1//=*/}
|
||||||
|
value=${1//*=/}
|
||||||
|
keys_all+="$key "
|
||||||
|
export "$key"="$value"
|
||||||
|
shift
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
add_to_var () {
|
add_to_var () {
|
||||||
if ! echo ${!1} | grep "$2" &>/dev/null
|
if ! echo ${!1} | grep "$2" &>/dev/null
|
||||||
then export $1="${!1} $2"
|
then export $1="${!1} $2"
|
||||||
|
@ -56,19 +56,19 @@ if [[ "$1" == *.[Pp][Pp][Aa][Cc][Kk] ]] ; then
|
|||||||
elif [[ -f "$1" ]] ; then
|
elif [[ -f "$1" ]] ; then
|
||||||
portwine_exe="$(realpath -s "$1")"
|
portwine_exe="$(realpath -s "$1")"
|
||||||
elif [[ -f "$OLDPWD/$1" ]] \
|
elif [[ -f "$OLDPWD/$1" ]] \
|
||||||
&& [[ "$1" == *.[Ee][Xx][Ee] || "$1" == *.[Bb][Aa][Tt] || "$1" == *.[Rr][Ee][Gg] || "$1" == *.[Mm][Ss][Ii] ]]
|
&& [[ "$1" =~ (.[Ee][Xx][Ee]$|.[Bb][Aa][Tt]$|.[Mm][Ss][Ii]$|.[Rr][Ee][Gg]$) ]]
|
||||||
then
|
then
|
||||||
portwine_exe="$(realpath -s "$OLDPWD/$1")"
|
portwine_exe="$(realpath -s "$OLDPWD/$1")"
|
||||||
elif [[ "$1" == "--debug" ]] \
|
elif [[ "$1" =~ (^--debug$|^--launch$|^--edit-db$) ]] \
|
||||||
&& [[ -f "$2" ]]
|
&& [[ -f "$2" ]]
|
||||||
then
|
then
|
||||||
portwine_exe="$(realpath -s "$2")"
|
portwine_exe="$(realpath -s "$2")"
|
||||||
elif [[ "$1" == "--debug" ]] \
|
elif [[ "$1" =~ (^--debug$|^--launch$|^--edit-db$) ]] \
|
||||||
&& [[ -f "$OLDPWD/$2" ]] \
|
&& [[ -f "$OLDPWD/$2" ]] \
|
||||||
&& [[ "$2" == *.[Ee][Xx][Ee] || "$2" == *.[Bb][Aa][Tt] || "$2" == *.[Rr][Ee][Gg] || "$2" == *.[Mm][Ss][Ii] ]]
|
&& [[ "$2" =~ (.[Ee][Xx][Ee]$|.[Bb][Aa][Tt]$|.[Mm][Ss][Ii]$|.[Rr][Ee][Gg]$) ]]
|
||||||
then
|
then
|
||||||
portwine_exe="$(realpath -s "$OLDPWD/$2")"
|
portwine_exe="$(realpath -s "$OLDPWD/$2")"
|
||||||
elif [[ "$1" == *.[Ee][Xx][Ee] || "$1" == *.[Bb][Aa][Tt] || "$1" == *.[Mm][Ss][Ii] || "$1" == *.[Rr][Ee][Gg] ]]
|
elif [[ "$1" =~ (.[Ee][Xx][Ee]$|.[Bb][Aa][Tt]$|.[Mm][Ss][Ii]$|.[Rr][Ee][Gg]$) ]]
|
||||||
then
|
then
|
||||||
portwine_exe="$1"
|
portwine_exe="$1"
|
||||||
MISSING_DESKTOP_FILE="1"
|
MISSING_DESKTOP_FILE="1"
|
||||||
@ -365,7 +365,7 @@ fi
|
|||||||
|
|
||||||
### CLI ###
|
### CLI ###
|
||||||
|
|
||||||
case "${1}" in
|
case "$1" in
|
||||||
'--help' )
|
'--help' )
|
||||||
files_from_autoinstall=$(ls "${PORT_SCRIPTS_PATH}/pw_autoinstall")
|
files_from_autoinstall=$(ls "${PORT_SCRIPTS_PATH}/pw_autoinstall")
|
||||||
echo -e "
|
echo -e "
|
||||||
@ -418,6 +418,16 @@ use: [--repair] [--reinstall] [--autoinstall]
|
|||||||
|
|
||||||
'--update' )
|
'--update' )
|
||||||
gui_pw_update ;;
|
gui_pw_update ;;
|
||||||
|
|
||||||
|
'--launch' )
|
||||||
|
portwine_launch
|
||||||
|
stop_portwine ;;
|
||||||
|
|
||||||
|
'--edit-db' )
|
||||||
|
# --edit-db /полный/путь/до/файла.exe PW_MANGOHUD=1 PW_VKBASALT=0 (и т.д) для примера
|
||||||
|
set_several_variables ${@:3}
|
||||||
|
edit_db_from_gui $keys_all
|
||||||
|
exit 0 ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
### GUI ###
|
### GUI ###
|
||||||
|
Loading…
Reference in New Issue
Block a user