diff --git a/AmRRON-Vara-setup.sh b/AmRRON-Vara-setup.sh index 436bed7..d94a9ae 100755 --- a/AmRRON-Vara-setup.sh +++ b/AmRRON-Vara-setup.sh @@ -344,7 +344,57 @@ echo "User already in audio group" fi } +function install_wine_resolute() { + +cd ~/ && wget -N https://github.com/Kron4ek/Wine-Builds/releases/download/9.16/wine-9.16-amd64.tar.xz || +{ ERRCODE="Failed to download wine 9.16"; errors; return; } + +wget -N wget https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks && chmod +x winetricks || +{ ERRCODE="Failed to download winetricks"; errors; return; } + +tar -xf ~/wine-9.16-amd64.tar.xz && rm wine-9.16-amd64.tar.xz || +{ ERRCODE="Failed to extract archive"; errors; return; } + +sudo ln -sf ~/wine-9.16-amd64/bin/wine /usr/local/bin/wine || +{ ERRCODE="Failed to create symlink for wine"; errors; return; } + +sudo ln -sf ~/wine-9.16-amd64/bin/wineserver /usr/local/bin/wineserver || +{ ERRCODE="Failed to create symlink for wineserver"; errors; return; } + +sudo ln -sf ~/wine-9.16-amd64/bin/winecfg /usr/local/bin/winecfg || +{ ERRCODE="Failed to create symlink for winecfg"; errors; return; } + +sudo ln -sf ~/wine-9.16-amd64/bin/winetricks /usr/local/bin/winetricks|| +{ ERRCODE="Failed to create symlink for winetricks"; errors; return; } + +DISPLAY=0 WINEARCH=win32 wine wineboot || +{ ERRCODE="Failed to set winearch=win32 and wineboot"; errors; return; } + +mkdir -p $HOME/.cache/winetricks/vb6run && cp $DIR/Files/VB6.0-KB290887-X86.exe $HOME/.cache/winetricks/vb6run/ || +{ ERRCODE="Failed to cp vb6run installer to cache"; errors; return; } +winetricks -q vb6run win7 sound=pulse || # removed pdh_nt4 +{ ERRCODE="Failed to run winetricks vb6run win7 sound=pulse"; errors; return; } + +#cleanup cache from installers +rm -rf ~/.cache/winetricks/ || +{ ERRCODE="Failed to remove ~/.cache/winetricks files. These can be removed to free space."; errors; return; } + +echo "You will need to select your sound system for wine in the following dialog." | yad --image=$DIR/images/corps-icon.png \ +--text-info --wrap \ +--center --button="gtk-ok:0" \ +--title "WINECFG - Select audio." ${r} ${c} +winecfg + + + + +} + + function install_wine() { + if [[ $OSCN = "resolute" ]]; then + install_wine_resolute + else export WINEARCH=win32 #install dependencies @@ -377,6 +427,8 @@ echo "You will need to select your sound system for wine in the following dialog --title "WINECFG - Select audio." ${r} ${c} winecfg +fi + } function install_varahf() { @@ -393,18 +445,6 @@ sudo apt install -y curl p7zip-full winbind|| fi -#Install Drivers -#if [[ ! -f $HOME/.wine/drive_c/windows/system32/pdh.dll ]]; then -#cd $HOME/Downloads && wget http://files.k6eta.com/pdh.dll.zip || -#{ ERRCODE="Failed to download k6eta pdh.dll drivers"; errors; return; } -#unzip pdh.dll.zip && rm pdh.dll.zip || -#{ ERRCODE="Failed to unzip k6eta drivers"; errors; return; } -#mv pdh.dll $HOME/.wine/drive_c/windows/system32 || -#{ ERRCODE="Failed to move drivers to $HOME/.wine/drive_c/windows/system32"; errors; return; } -#else -#echo "PDH.dll Driver already installed" -#fi - # Define the target directory and the source directory TARGET_DIR="$HOME/.wine/drive_c/windows/system32" SOURCE_DIR="$DIR/Files/ocx"