diff --git a/docker_images/latest/entrypoint.sh b/docker_images/latest/entrypoint.sh index 318fe49..f3f1ffb 100644 --- a/docker_images/latest/entrypoint.sh +++ b/docker_images/latest/entrypoint.sh @@ -3,6 +3,12 @@ cd /home/container +# Information output +echo "Running on Debian $(cat /etc/debian_version)" +echo "Current timezone: $(cat /etc/timezone)" +wine --version + + if [[ $XVFB == 1 ]]; then Xvfb :0 -screen 0 ${DISPLAY_WIDTH}x${DISPLAY_HEIGHT}x${DISPLAY_DEPTH} & fi @@ -13,38 +19,36 @@ echo "First launch will throw some errors. Ignore them" mkdir -p $WINEPREFIX # Check if wine-gecko required and install it if so -if [[ $WINETRICKS_RUN =~ gecko ]]; then - echo "Installing Gecko" - WINETRICKS_RUN=${WINETRICKS_RUN/gecko} - if [ ! -f "$WINEPREFIX/gecko_x86.msi" ]; then - wget -q -O $WINEPREFIX/gecko_x86.msi http://dl.winehq.org/wine/wine-gecko/2.47.4/wine_gecko-2.47.4-x86.msi - fi +echo "Installing Gecko" +WINETRICKS_RUN=${WINETRICKS_RUN/gecko} - if [ ! -f "$WINEPREFIX/gecko_x86_64.msi" ]; then - wget -q -O $WINEPREFIX/gecko_x86_64.msi http://dl.winehq.org/wine/wine-gecko/2.47.4/wine_gecko-2.47.4-x86_64.msi - fi - - wine msiexec /i $WINEPREFIX/gecko_x86.msi /qn /quiet /norestart /log $WINEPREFIX/gecko_x86_install.log - wine msiexec /i $WINEPREFIX/gecko_x86_64.msi /qn /quiet /norestart /log $WINEPREFIX/gecko_x86_64_install.log +if [ ! -f "$WINEPREFIX/gecko_x86.msi" ]; then + wget -q -O $WINEPREFIX/gecko_x86.msi http://dl.winehq.org/wine/wine-gecko/2.47.4/wine_gecko-2.47.4-x86.msi fi +if [ ! -f "$WINEPREFIX/gecko_x86_64.msi" ]; then + wget -q -O $WINEPREFIX/gecko_x86_64.msi http://dl.winehq.org/wine/wine-gecko/2.47.4/wine_gecko-2.47.4-x86_64.msi +fi + +wine msiexec /i $WINEPREFIX/gecko_x86.msi /qn /quiet /norestart /log $WINEPREFIX/gecko_x86_install.log +wine msiexec /i $WINEPREFIX/gecko_x86_64.msi /qn /quiet /norestart /log $WINEPREFIX/gecko_x86_64_install.log + # Check if wine-mono required and install it if so -if [[ $WINETRICKS_RUN =~ mono ]]; then - echo "Installing mono" - WINETRICKS_RUN=${WINETRICKS_RUN/mono} - if [ ! -f "$WINEPREFIX/mono.msi" ]; then - wget -q -O $WINEPREFIX/mono.msi https://dl.winehq.org/wine/wine-mono/9.1.0/wine-mono-9.1.0-x86.msi - fi +echo "Installing mono" +WINETRICKS_RUN=${WINETRICKS_RUN/mono} - wine msiexec /i $WINEPREFIX/mono.msi /qn /quiet /norestart /log $WINEPREFIX/mono_install.log +if [ ! -f "$WINEPREFIX/mono.msi" ]; then + wget -q -O $WINEPREFIX/mono.msi https://dl.winehq.org/wine/wine-mono/9.1.0/wine-mono-9.1.0-x86.msi fi +wine msiexec /i $WINEPREFIX/mono.msi /qn /quiet /norestart /log $WINEPREFIX/mono_install.log + # List and install other packages for trick in $WINETRICKS_RUN; do - echo "Installing $trick" - winetricks -q $trick + echo "Installing $trick" + winetricks -q $trick done diff --git a/docker_images/runtimedeps/Dockerfile b/docker_images/runtimedeps/Dockerfile index f9eec77..2845528 100644 --- a/docker_images/runtimedeps/Dockerfile +++ b/docker_images/runtimedeps/Dockerfile @@ -43,7 +43,6 @@ ENV DISPLAY=:0 ENV DISPLAY_WIDTH=1024 ENV DISPLAY_HEIGHT=768 ENV DISPLAY_DEPTH=16 -ENV AUTO_UPDATE=1 ENV XVFB=1 USER container diff --git a/lib/proton.dart b/lib/proton.dart index 55a6a4b..2adb33e 100644 --- a/lib/proton.dart +++ b/lib/proton.dart @@ -55,11 +55,11 @@ Future runDetachedProton( List args = ["run", command]; args.addAll(argx); - List wineArgs = [command]; + List wineArgs = ["--auto-servernum", "wine", command]; wineArgs.addAll(argx); if (settings.inst!.pterodactylMode) - StateMachine.PROC = await Process.start("wine", wineArgs, + StateMachine.PROC = await Process.start("xvfb-run", wineArgs, environment: env, workingDirectory: workingDir, mode: ProcessStartMode.normal);