--- a/codesys-ide/install2.sh +++ b/codesys-ide/install2.sh @@ -23,7 +23,8 @@ # ################################################################################ -WINE=wine-development +WINE=wine +WINESERVER=wineserver CDS_LINK="https://store.codesys.com/ftp_download/3S/CODESYS/300000/3.5.16.0/CODESYS%203.5.16.0.exe" TRICKS_LINK="https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks" ADDITIONAL_PACKAGES=https://forge.codesys.com/svn/tol,cforge,code/trunk/cforge.package @@ -53,7 +54,7 @@ if which ${WINE}; then echo "=> OK" else - echo "ERROR: Please install wine32-development and wine64-development" + echo "ERROR: Please install wine32 and wine64" exit 1 fi echo -n "Checking prerequisite 'msiextract'" @@ -77,24 +78,24 @@ function winetricks { ./winetricks nocrashdialog - wineserver-development -w + ${WINESERVER} -w ./winetricks dotnet46 - wineserver-development -w + ${WINESERVER} -w } function winetricks_silent { ./winetricks nocrashdialog - wineserver-development -w + ${WINESERVER} -w ./winetricks -q dotnet46 - wineserver-development -w + ${WINESERVER} -w } function install { - WINEPREFIX=~/.wine.cds wine-development ./setup.exe /s /x /b"C:\tmp" /v"/qn" + WINEPREFIX=~/.wine.cds wine ./setup.exe /s /x /b"C:\tmp" /v"/qn" ( - wineserver-development -w + ${WINESERVER} -w cd ~/.wine.cds/drive_c/tmp msiextract *.msi mv Program*/CODESYS* ../CODESYS @@ -105,7 +106,7 @@ function post_install { ${WINE} reg add "HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList\\S-1-5-21-0-0-0-1000" - wineserver-development -w + ${WINESERVER} -w } no_check="y"