bump wine version

add comic32.exe
try fix
2024-12-23 15:52:59 +03:00 · 2023-10-11 08:33:36 +00:00 · 2023-10-11 08:32:51 +00:00 · 2023-10-11 08:00:24 +00:00 · 2023-10-11 05:36:34 +00:00 · 2023-10-11 05:28:00 +00:00
15 changed files with 32 additions and 9 deletions
--- a/src/wine/corefonts/andale32.exe
+++ b/src/wine/corefonts/andale32.exe
--- a/src/wine/corefonts/arial32.exe
+++ b/src/wine/corefonts/arial32.exe
--- a/src/wine/corefonts/arialb32.exe
+++ b/src/wine/corefonts/arialb32.exe
--- a/src/wine/corefonts/comic32.exe
+++ b/src/wine/corefonts/comic32.exe
--- a/src/wine/corefonts/courie32.exe
+++ b/src/wine/corefonts/courie32.exe
--- a/src/wine/corefonts/georgi32.exe
+++ b/src/wine/corefonts/georgi32.exe
--- a/src/wine/corefonts/impact32.exe
+++ b/src/wine/corefonts/impact32.exe
--- a/src/wine/corefonts/times32.exe
+++ b/src/wine/corefonts/times32.exe
--- a/src/wine/corefonts/trebuc32.exe
+++ b/src/wine/corefonts/trebuc32.exe
--- a/src/wine/corefonts/verdan32.exe
+++ b/src/wine/corefonts/verdan32.exe
--- a/src/wine/corefonts/wd97vwr32.exe
+++ b/src/wine/corefonts/wd97vwr32.exe
--- a/src/wine/corefonts/webdin32.exe
+++ b/src/wine/corefonts/webdin32.exe
--- a/src/wine/devcontainer-feature.json
+++ b/src/wine/devcontainer-feature.json
@ -1,7 +1,7 @@
 {
    "name": "Wine",
    "id": "wine",
-    "version": "0.0.3",
+    "version": "0.0.4",
    "description": "Installs Wine.",
    "documentationURL": "https://github.com/Maks1mS/devcontainers-features/tree/main/src/wine",
    "options": {
@ -14,4 +14,4 @@
    "installsAfter": [
        "ghcr.io/devcontainers/features/common-utils"
    ]
-}
+}
--- a/src/wine/install.sh
+++ b/src/wine/install.sh
@ -5,8 +5,25 @@ WINEVERSION="${VERSION:-"latest"}"

 WINEHOME=$_REMOTE_USER_HOME
 WINEPREFIX="$WINEHOME/.wine32"
-WINEARCH="win32"
-WINEDEBUG="-all"
+# WINEARCH="win32"
+# WINEDEBUG="-all"
+
+COREFONTS_BASE_URL="https://raw.githubusercontent.com/Maks1mS/devcontainers-features/main/src/wine/corefonts/"
+COREFONTS_FILES=(
+  "andale32.exe"
+  "arial32.exe"
+  "arialb32.exe"
+  "courie32.exe"
+  "georgi32.exe"
+  "impact32.exe"
+  "times32.exe"
+  "trebuc32.exe"
+  "verdan32.exe"
+  "wd97vwr32.exe"
+  "webdin32.exe"
+  "comic32.exe"
+)
+COREFONTS_CACHE_DIR="\$HOME/.cache/winetricks/corefonts/"

 update_rc_file() {
  # see if folder containing file exists
@ -57,10 +74,15 @@ export WINEDEBUG=-all"
  update_rc_file "$_REMOTE_USER_HOME/.profile" "${snippet}"
  update_rc_file "$_REMOTE_USER_HOME/.bashrc" "${snippet}"

-  su -l "$_REMOTE_USER" -c "mkdir -p $WINEPREFIX && wine wineboot --init"
-  su -l "$_REMOTE_USER" -c "echo \"check-certificate = off\" >> ~/.wgetrc"
-  su -l "$_REMOTE_USER" -c "echo \"check_certificate = off\" >> ~/.wgetrc"
-  su -l "$_REMOTE_USER" -c "winetricks corefonts"
+  su -l $_REMOTE_USER <<EOF
+    mkdir -p "\$WINEPREFIX"
+    wine wineboot --init
+    mkdir -p "$COREFONTS_CACHE_DIR"
+    for filename in ${COREFONTS_FILES[@]}; do
+      wget -P "$COREFONTS_CACHE_DIR" "$COREFONTS_BASE_URL\$filename"
+    done
+    winetricks corefonts
+EOF

  # Cleanup
  apt purge --auto-remove -y
--- a/test/wine/wine_specified_version.sh
+++ b/test/wine/wine_specified_version.sh
@ -3,6 +3,7 @@ set -e

 source dev-container-features-test-lib

+check "wine exists" bash -c "wine --version"
 check "wine version is same" bash -c "[[ "$(wine --version | tr -d -c 0-9.)" == *"8.5"* ]]"

-reportResults
+reportResults
Author	SHA1	Message	Date
Maxim Slipenko	d14d3b178c	bump wine version	2023-10-11 08:33:36 +00:00
Maxim Slipenko	53721cc2ba	add comic32.exe	2023-10-11 08:32:51 +00:00
Maxim Slipenko	83b1e774b0	try fix	2023-10-11 08:00:24 +00:00
Maxim Slipenko	e6b8f06415	try fix	2023-10-11 05:36:34 +00:00
Maxim Slipenko	1ee909955c	try fix corefonts	2023-10-11 05:28:00 +00:00
Maxim Slipenko	81cd078b31	add corefonts	2023-10-11 05:07:32 +00:00