src/wine/devcontainer-feature.json

@@ -1,7 +1,7 @@
 {
     "name": "Wine",
     "id": "wine",
-    "version": "0.0.4",
+    "version": "0.0.3",
     "description": "Installs Wine.",
     "documentationURL": "https://github.com/Maks1mS/devcontainers-features/tree/main/src/wine",
     "options": {

src/wine/install.sh

@@ -5,25 +5,8 @@ WINEVERSION="${VERSION:-"latest"}"
 
 WINEHOME=$_REMOTE_USER_HOME
 WINEPREFIX="$WINEHOME/.wine32"
-# 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/"
+WINEARCH="win32"
+WINEDEBUG="-all"
 
 update_rc_file() {
   # see if folder containing file exists
@@ -74,15 +57,10 @@ export WINEDEBUG=-all"
   update_rc_file "$_REMOTE_USER_HOME/.profile" "${snippet}"
   update_rc_file "$_REMOTE_USER_HOME/.bashrc" "${snippet}"
 
-  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
+  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"
 
   # Cleanup
   apt purge --auto-remove -y

test/wine/wine_specified_version.sh

@@ -3,7 +3,6 @@ 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