bump wine version

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

src/wine/README.md

@@ -7,7 +7,7 @@ Installs Wine.
 
 ```json
 "features": {
-    "ghcr.io/Maks1mS/devcontainers-features/wine:1": {}
+    "ghcr.io/Maks1mS/devcontainers-features/wine:0": {}
 }
 ```
 
@@ -15,7 +15,7 @@ Installs Wine.
 
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
-| version | - | string | latest |
+| version | Version of Wine | string | latest |
 
 ## OS Support
 

src/wine/devcontainer-feature.json

@@ -1,12 +1,14 @@
 {
     "name": "Wine",
     "id": "wine",
-    "version": "0.0.1",
+    "version": "0.0.4",
     "description": "Installs Wine.",
+    "documentationURL": "https://github.com/Maks1mS/devcontainers-features/tree/main/src/wine",
     "options": {
         "version": {
             "type": "string",
-            "default": "latest"
+            "default": "latest",
+            "description": "Version of Wine"
         }
     },
     "installsAfter": [

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
@@ -43,26 +60,29 @@ install_debian() {
   fi
 
   apt-get update
-  apt-get install -y --no-install-recommends winehq-staging
+  apt-get install -y --install-recommends winehq-staging
 
   wget https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks -O /usr/bin/winetricks
   chmod +rx /usr/bin/winetricks
 
-  mkdir -p "$WINEPREFIX"
-
-  snippet="
-  WINEHOME=\"$_REMOTE_USER_HOME\"
-  WINEPREFIX=\"\$WINEHOME/.wine32\"
-  WINEARCH=win32
-  WINEDEBUG=-all
-  "
+  snippet="export WINEHOME=\"$_REMOTE_USER_HOME\"
+export WINEPREFIX=\"\$WINEHOME/.wine32\"
+export WINEARCH=win32
+export WINEDEBUG=-all"
 
   update_rc_file "$_REMOTE_USER_HOME/.zshenv" "${snippet}"
   update_rc_file "$_REMOTE_USER_HOME/.profile" "${snippet}"
   update_rc_file "$_REMOTE_USER_HOME/.bashrc" "${snippet}"
 
-  su -l "$_REMOTE_USER" -c "mkdir -p $WINEPREFIX"
-  su -l "$_REMOTE_USER" -c "wine wineboot --init"
+  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

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