Skip to content

Commit ce6e3d7

Browse files
authored
[Wine Script] Add -y / -f to a couple of commands (#215)
1 parent 535e9dd commit ce6e3d7

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

website/content/public/downloads/winesetup/net6_mgfxc_wine_setup.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ popd
4444
# get dotnet
4545
DOTNET_URL="https://download.visualstudio.microsoft.com/download/pr/44d08222-aaa9-4d35-b24b-d0db03432ab7/52a4eb5922afd19e8e0d03e0dbbb41a0/dotnet-sdk-6.0.302-win-x64.zip"
4646
curl $DOTNET_URL --output "$SCRIPT_DIR/dotnet-sdk.zip"
47-
7z x "$SCRIPT_DIR/dotnet-sdk.zip" -o"$WINEPREFIX/drive_c/windows/system32/"
47+
7z x "$SCRIPT_DIR/dotnet-sdk.zip" -o"$WINEPREFIX/drive_c/windows/system32/" -y
4848

4949
# get d3dcompiler_47
5050
FIREFOX_URL="https://download-installer.cdn.mozilla.net/pub/firefox/releases/62.0.3/win64/ach/Firefox%20Setup%2062.0.3.exe"
5151
curl $FIREFOX_URL --output "$SCRIPT_DIR/firefox.exe"
52-
7z x "$SCRIPT_DIR/firefox.exe" -o"$SCRIPT_DIR/firefox_data/"
52+
7z x "$SCRIPT_DIR/firefox.exe" -o"$SCRIPT_DIR/firefox_data/" -y
5353
cp -f "$SCRIPT_DIR/firefox_data/core/d3dcompiler_47.dll" "$WINEPREFIX/drive_c/windows/system32/d3dcompiler_47.dll"
5454

5555
# append MGFXC_WINE_PATH env variable
@@ -66,7 +66,7 @@ then
6666
chmod +x "$HOME/.winemonogame/wine_wrapper.sh"
6767

6868
# symlink wine64 to our wrapper script
69-
ln -s "$HOME/.winemonogame/wine_wrapper.sh" "$HOME/.winemonogame/wine64"
69+
ln -sf "$HOME/.winemonogame/wine_wrapper.sh" "$HOME/.winemonogame/wine64"
7070
fi
7171

7272
# cleanup

website/content/public/downloads/winesetup/net8_mgfxc_wine_setup.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ popd
5252
# get dotnet
5353
DOTNET_URL="https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.401/dotnet-sdk-8.0.401-win-x64.zip"
5454
curl $DOTNET_URL --output "$SCRIPT_DIR/dotnet-sdk.zip"
55-
7z x "$SCRIPT_DIR/dotnet-sdk.zip" -o"$WINEPREFIX/drive_c/windows/system32/"
55+
7z x "$SCRIPT_DIR/dotnet-sdk.zip" -o"$WINEPREFIX/drive_c/windows/system32/" -y
5656

5757
# get d3dcompiler_47
5858
FIREFOX_URL="https://download-installer.cdn.mozilla.net/pub/firefox/releases/62.0.3/win64/ach/Firefox%20Setup%2062.0.3.exe"
5959
curl $FIREFOX_URL --output "$SCRIPT_DIR/firefox.exe"
60-
7z x "$SCRIPT_DIR/firefox.exe" -o"$SCRIPT_DIR/firefox_data/"
60+
7z x "$SCRIPT_DIR/firefox.exe" -o"$SCRIPT_DIR/firefox_data/" -y
6161
cp -f "$SCRIPT_DIR/firefox_data/core/d3dcompiler_47.dll" "$WINEPREFIX/drive_c/windows/system32/d3dcompiler_47.dll"
6262

6363
# append MGFXC_WINE_PATH env variable
@@ -74,7 +74,7 @@ then
7474
chmod +x "$HOME/.winemonogame/wine_wrapper.sh"
7575

7676
# symlink wine64 to our wrapper script
77-
ln -s "$HOME/.winemonogame/wine_wrapper.sh" "$HOME/.winemonogame/wine64"
77+
ln -sf "$HOME/.winemonogame/wine_wrapper.sh" "$HOME/.winemonogame/wine64"
7878
fi
7979

8080
# cleanup

website/content/public/downloads/winesetup/net9_mgfxc_wine_setup.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ popd
5252
# get dotnet
5353
DOTNET_URL="https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.104/dotnet-sdk-9.0.104-win-x64.zip"
5454
curl $DOTNET_URL --output "$SCRIPT_DIR/dotnet-sdk.zip"
55-
7z x "$SCRIPT_DIR/dotnet-sdk.zip" -o"$WINEPREFIX/drive_c/windows/system32/"
55+
7z x "$SCRIPT_DIR/dotnet-sdk.zip" -o"$WINEPREFIX/drive_c/windows/system32/" -y
5656

5757
# get d3dcompiler_47
5858
FIREFOX_URL="https://download-installer.cdn.mozilla.net/pub/firefox/releases/62.0.3/win64/ach/Firefox%20Setup%2062.0.3.exe"
5959
curl $FIREFOX_URL --output "$SCRIPT_DIR/firefox.exe"
60-
7z x "$SCRIPT_DIR/firefox.exe" -o"$SCRIPT_DIR/firefox_data/"
60+
7z x "$SCRIPT_DIR/firefox.exe" -o"$SCRIPT_DIR/firefox_data/" -y
6161
cp -f "$SCRIPT_DIR/firefox_data/core/d3dcompiler_47.dll" "$WINEPREFIX/drive_c/windows/system32/d3dcompiler_47.dll"
6262

6363
# append MGFXC_WINE_PATH env variable
@@ -74,7 +74,7 @@ then
7474
chmod +x "$HOME/.winemonogame/wine_wrapper.sh"
7575

7676
# symlink wine64 to our wrapper script
77-
ln -s "$HOME/.winemonogame/wine_wrapper.sh" "$HOME/.winemonogame/wine64"
77+
ln -sf "$HOME/.winemonogame/wine_wrapper.sh" "$HOME/.winemonogame/wine64"
7878
fi
7979

8080
# cleanup

0 commit comments

Comments
 (0)