diff --git a/AmRRON-Vara-setup.sh b/AmRRON-Vara-setup.sh index 18851d6..5ed01c0 100755 --- a/AmRRON-Vara-setup.sh +++ b/AmRRON-Vara-setup.sh @@ -400,15 +400,9 @@ function install_wine() { else export WINEARCH=win32 -#install dependencies -if [[ $OSCN = "resolute" ]]; then - sudo apt install -y wine winetricks || -{ ERRCODE="Failed to install wine and winetricks"; errors; return; } - -else sudo apt install -y wine-stable winetricks || { ERRCODE="Failed to install wine-stable and winetricks"; errors; return; } -fi + ### Version 2 attempt DISPLAY=0 WINEARCH=win32 wine wineboot || @@ -493,7 +487,7 @@ unzip VARA\ HF\ $VARAHFVER*.zip || { ERRCODE="Failed to unzip VARA HF"; errors; return; } #install VARA HF with wine -/usr/bin/wine VARA\ setup\ \(Run\ as\ Administrator\).exe || +wine VARA\ setup\ \(Run\ as\ Administrator\).exe || { ERRCODE="Failed to install VARA HF"; errors; return; } } @@ -556,7 +550,7 @@ unzip VARA\ FM\ $VARAFMVER*.zip || { ERRCODE="Failed to unzip VARA FM"; errors; return; } #install VARA FM with wine -/usr/bin/wine VARA\ FM\ setup\ \(Run\ as\ Administrator\).exe || +wine VARA\ FM\ setup\ \(Run\ as\ Administrator\).exe || { ERRCODE="Failed to install VARA FM"; errors; return; } } @@ -616,7 +610,7 @@ wget -q -r -l1 -np -nd -A "Winlink_Express_install_*.zip" https://downloads.winl { ERRCODE="Failed to download Winlink Express"; errors; return; } (yes | unzip Winlink_Express_install*.zip) && rm Winlink_Express_install*.zip || { ERRCODE="Failed to unzip Winlink Express"; errors; return; } -/usr/bin/wine Winlink_Express_install*.exe && rm Winlink_Express_install*.exe|| +wine Winlink_Express_install*.exe && rm Winlink_Express_install*.exe|| { ERRCODE="Failed to Install Winlink Express"; errors; return; }