diff --git a/audiogame-manager.sh b/audiogame-manager.sh index e14e5b0..fa09638 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -256,7 +256,7 @@ download() { # Skip if the item is in cache. test -e "${cache}/${dest}" && continue if ! wget -4 -O "${cache}/${dest}" "${i}" ; then - echo "Could not download..." + echo "Could not download \"$i\"..." exit 1 fi done @@ -283,8 +283,19 @@ install_wine_bottle() { export WINEPREFIX="$HOME/.local/wine/${bottle}" # Arguments to the function are dependancies to be installed. (DISPLAY="" wineboot -u - wine msiexec /i z:$(find /usr/share/wine/mono -name "wine-mono*x86.msi") /quiet - wine msiexec /i z:$(find /usr/share/wine/gecko -name "wine-gecko*x86.msi") /quiet + # Get location of mono and gecko. + monoPath="$(find /usr/share/wine/mono -name "wine-mono*x86.msi")" + geckoPath="$(find /usr/share/wine/gecko -name "wine-gecko*x86.msi")" + if [[ -z "$monoPath" ]]; then + download 'http://dl.winehq.org/wine/wine-mono/6.0.0/wine-mono-6.0.0-x86.msi' + monoPath="${cache}/wine-mono-6.0.0-x86.msi" + fi + if [[ -z "$geckoPath" ]]; then + download 'http://dl.winehq.org/wine/wine-gecko/2.40/wine_gecko-2.40-x86.msi' + geckoPath="${cache}/wine_gecko-2.40-x86.msi" + fi + wine msiexec /i z:"$monoPath" /quiet + wine msiexec /i z:"$geckoPath" /quiet winetricks -q $@ ${winVer:-winxp} ${winetricksSettings}) | dialog --progressbox "Installing wine bottle, please wait..." -1 -1 }