AriasCreations/ConanServerManager
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Install some necessary wine-tricks

Browse source
This commit is contained in:
zontreck 2024-05-25 16:43:07 -07:00
parent 9703ad4345
commit 420b7dbd88
3 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

46
docker_images/latest/entrypoint.sh
View file

@ -3,6 +3,12 @@
cd /home/container 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 if [[ $XVFB == 1 ]]; then
Xvfb :0 -screen 0 ${DISPLAY_WIDTH}x${DISPLAY_HEIGHT}x${DISPLAY_DEPTH} & Xvfb :0 -screen 0 ${DISPLAY_WIDTH}x${DISPLAY_HEIGHT}x${DISPLAY_DEPTH} &
fi fi
@ -13,38 +19,36 @@ echo "First launch will throw some errors. Ignore them"
mkdir -p $WINEPREFIX mkdir -p $WINEPREFIX
# Check if wine-gecko required and install it if so # 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 echo "Installing Gecko"
wget -q -O $WINEPREFIX/gecko_x86.msi http://dl.winehq.org/wine/wine-gecko/2.47.4/wine_gecko-2.47.4-x86.msi WINETRICKS_RUN=${WINETRICKS_RUN/gecko}
fi
if [ ! -f "$WINEPREFIX/gecko_x86_64.msi" ]; then if [ ! -f "$WINEPREFIX/gecko_x86.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 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
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
fi 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 # 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 echo "Installing mono"
wget -q -O $WINEPREFIX/mono.msi https://dl.winehq.org/wine/wine-mono/9.1.0/wine-mono-9.1.0-x86.msi WINETRICKS_RUN=${WINETRICKS_RUN/mono}
fi
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 fi
wine msiexec /i $WINEPREFIX/mono.msi /qn /quiet /norestart /log $WINEPREFIX/mono_install.log
# List and install other packages # List and install other packages
for trick in $WINETRICKS_RUN; do for trick in $WINETRICKS_RUN; do
echo "Installing $trick" echo "Installing $trick"
winetricks -q $trick winetricks -q $trick
done done

1
docker_images/runtimedeps/Dockerfile
View file

@ -43,7 +43,6 @@ ENV DISPLAY=:0
ENV DISPLAY_WIDTH=1024 ENV DISPLAY_WIDTH=1024
ENV DISPLAY_HEIGHT=768 ENV DISPLAY_HEIGHT=768
ENV DISPLAY_DEPTH=16 ENV DISPLAY_DEPTH=16
ENV AUTO_UPDATE=1
ENV XVFB=1 ENV XVFB=1
USER container USER container

4
lib/proton.dart
View file

@ -55,11 +55,11 @@ Future<void> runDetachedProton(
List<String> args = ["run", command]; List<String> args = ["run", command];
args.addAll(argx); args.addAll(argx);
List<String> wineArgs = [command]; List<String> wineArgs = ["--auto-servernum", "wine", command];
wineArgs.addAll(argx); wineArgs.addAll(argx);
if (settings.inst!.pterodactylMode) if (settings.inst!.pterodactylMode)
StateMachine.PROC = await Process.start("wine", wineArgs, StateMachine.PROC = await Process.start("xvfb-run", wineArgs,
environment: env, environment: env,
workingDirectory: workingDir, workingDirectory: workingDir,
mode: ProcessStartMode.normal); mode: ProcessStartMode.normal);