--- a/codesys-ide/install2.sh +++ b/codesys-ide/install2.sh @@ -76,9 +76,17 @@ function winetricks { - ./winetricks -q vcrun2005 vcrun2008 vcrun2013 vcrun2015 dotnet46 &> /dev/zero + ./winetricks nocrashdialog wineserver-development -w + ./winetricks dotnet46 + wineserver-development -w +} + +function winetricks_silent +{ ./winetricks nocrashdialog + wineserver-development -w + ./winetricks -q dotnet46 wineserver-development -w } @@ -105,6 +113,7 @@ no_winetricks="y" no_install="y" no_postinstall="y" +no_xvfb="y" case ${1} in --winetricks) no_winetricks="" @@ -114,6 +123,14 @@ ;; --postinstall) no_postinstall="" + ;; + --silent) + no_check="" + no_dl="" + no_winetricks="" + no_install="" + no_postinstall="" + no_xvfb="" ;; -h) echo "usage: $0 <param>" @@ -128,9 +145,17 @@ no_winetricks="" no_install="" no_postinstall="" + no_xvfb="" ;; esac +if [ -z ${no_xvfb} ]; then + echo "=== Start XVFB ===" + export DISPLAY=:98 + Xvfb :98 & + sleep 3 + jwm & +fi if [ -z ${no_check} ]; then echo "=== Checking Prerequisites ===" prereq @@ -141,7 +166,11 @@ fi if [ -z ${no_winetricks} ]; then echo "=== Installing Prerequisites w/ winetricks ===" - winetricks + if [ -z ${no_xvfb} ]; then + winetricks_silent + else + winetricks + fi fi if [ -z ${no_install} ]; then echo "=== Installing CODESYS ===" @@ -151,5 +180,9 @@ echo "=== Postinstall Fixups ===" post_install fi +if [ -z ${no_xvfb} ]; then + echo "=== Kill XVFB ===" + killall Xvfb +fi exit