Merge branch 'testing' for new binary release.

This commit is contained in:
Storm Dragon 2021-02-28 14:01:57 -05:00
commit 6cfdf58e68

View File

@ -195,16 +195,6 @@ checklist() {
else else
errorList+=("Warning: unix2dos is not installed. Some games need a configuration file in dos format before they will run.") errorList+=("Warning: unix2dos is not installed. Some games need a configuration file in dos format before they will run.")
fi fi
if [[ -d /usr/share/wine/gecko/ ]]; then
echo "Found wine gecko."
else
errorList+=("Warning: Wine gecko not found, some games may not work.")
fi
if [[ -d /usr/share/wine/mono/ ]]; then
echo "Found wine mono."
else
errorList+=("Warning: Wine mono not found, some games may not work.")
fi
if command -v xclip &> /dev/null ; then if command -v xclip &> /dev/null ; then
echo "Xclip is installed." echo "Xclip is installed."
else else
@ -279,6 +269,10 @@ install_wine_bottle() {
export WINEARCH="${WINEARCH:-win32}" export WINEARCH="${WINEARCH:-win32}"
local bottle="${game,,}" local bottle="${game,,}"
bottle="${bottle//[[:space:]]/-}" bottle="${bottle//[[:space:]]/-}"
if [[ -d "$HOME/.local/wine/${bottle}" ]]; then
echo "$HOME/.local/wine/${bottle} exists. Please remove it before running this installer."
exit 1
fi
mkdir -p "$HOME/.local/wine/${bottle}" mkdir -p "$HOME/.local/wine/${bottle}"
export WINEPREFIX="$HOME/.local/wine/${bottle}" export WINEPREFIX="$HOME/.local/wine/${bottle}"
# Arguments to the function are dependancies to be installed. # Arguments to the function are dependancies to be installed.
@ -613,6 +607,7 @@ declare -A command=(
[d]="Debug mode, wine will be much more verbose when games are launched with this flag." [d]="Debug mode, wine will be much more verbose when games are launched with this flag."
[h]="This help screen." [h]="This help screen."
[i]="Install games." [i]="Install games."
[I:]="Noninteractive game installation."
[k]="Kill a running game that is stuck." [k]="Kill a running game that is stuck."
[L]="Display license information." [L]="Display license information."
[l:]="Launch given game without interactive audiogame-manager menu specified by its wine bottle." [l:]="Launch given game without interactive audiogame-manager menu specified by its wine bottle."
@ -633,6 +628,9 @@ while getopts "${args}" i ; do
;; ;;
h) help;; h) help;;
i) game_installer;; i) game_installer;;
I)
game="${OPTARG}"
break;;
k) kill_game;; k) kill_game;;
L) license;; L) license;;
l) game_launcher "${OPTARG}";; l) game_launcher "${OPTARG}";;
@ -1262,7 +1260,8 @@ EOF
open_url "https://patreon.com/stormux" open_url "https://patreon.com/stormux"
;; ;;
*) *)
exit 0 [[ -n "${game}" ]] && echo "Game \"${game}\" not found."
exit 1
;; ;;
esac esac