Fixed some places where wine wasn't being properly set.
This commit is contained in:
parent
294557fe34
commit
5cc4eca7fd
@ -816,7 +816,11 @@ game_installer() {
|
|||||||
|
|
||||||
# remove games
|
# remove games
|
||||||
game_removal() {
|
game_removal() {
|
||||||
wine="${wine:-/usr/bin/wine}"
|
if [[ "$(uname -m)" == "aarch64" ]]; then
|
||||||
|
export wine="${wine:-/usr/bin/wine}"
|
||||||
|
else
|
||||||
|
export wine="${wine:-/usr/bin/wine}"
|
||||||
|
fi
|
||||||
mapfile -t lines < <(sed -e '/^$/d' -e '/^[[:space:]]*#/d' "${configFile}" 2> /dev/null)
|
mapfile -t lines < <(sed -e '/^$/d' -e '/^[[:space:]]*#/d' "${configFile}" 2> /dev/null)
|
||||||
if [[ ${#lines} -eq 0 ]]; then
|
if [[ ${#lines} -eq 0 ]]; then
|
||||||
echo "No games found."
|
echo "No games found."
|
||||||
@ -872,6 +876,11 @@ game_removal() {
|
|||||||
|
|
||||||
# kill games that are stuck
|
# kill games that are stuck
|
||||||
kill_game() {
|
kill_game() {
|
||||||
|
if [[ "$(uname -m)" == "aarch64" ]]; then
|
||||||
|
export wine="${wine:-/usr/bin/wine}"
|
||||||
|
else
|
||||||
|
export wine="${wine:-/usr/bin/wine}"
|
||||||
|
fi
|
||||||
mapfile -t lines < <(sed '/^$/d' "${configFile}" 2> /dev/null)
|
mapfile -t lines < <(sed '/^$/d' "${configFile}" 2> /dev/null)
|
||||||
if [[ ${#lines} -eq 0 ]]; then
|
if [[ ${#lines} -eq 0 ]]; then
|
||||||
echo "No games found."
|
echo "No games found."
|
||||||
@ -1079,7 +1088,11 @@ game_launcher() {
|
|||||||
fi
|
fi
|
||||||
get_bottle "${game[0]}"
|
get_bottle "${game[0]}"
|
||||||
# make sure wine is actually set to something
|
# make sure wine is actually set to something
|
||||||
|
if [[ "$(uname -m)" == "aarch64" ]]; then
|
||||||
export wine="${wine:-/usr/bin/wine}"
|
export wine="${wine:-/usr/bin/wine}"
|
||||||
|
else
|
||||||
|
export wine="${wine:-/usr/bin/wine}"
|
||||||
|
fi
|
||||||
echo -n "launching "
|
echo -n "launching "
|
||||||
${wine} --version
|
${wine} --version
|
||||||
# kill any previous existing wineservers for this prefix in case they didn't shut down properly.
|
# kill any previous existing wineservers for this prefix in case they didn't shut down properly.
|
||||||
|
Loading…
Reference in New Issue
Block a user