From c4d06eecd01caf6f7d9e9f71c47b44091578369d Mon Sep 17 00:00:00 2001
From: Howard20181 <40033067+Howard20181@users.noreply.github.com>
Date: Mon, 2 Jan 2023 16:19:10 +0800
Subject: [PATCH] Always use the Windows environment in WSL

---
 scripts/build.sh | 6 +++---
 scripts/run.sh   | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/scripts/build.sh b/scripts/build.sh
index 4349425..ce65f4e 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -647,10 +647,10 @@ cp "$WORK_DIR"/wsa/"$ARCH"/resources.pri "$WORK_DIR"/wsa/pri/en-us.pri \
 </index>
 </resources>
 EOF
-    if [ ! -f /proc/sys/fs/binfmt_misc/WSLInterop ] || which wine64 > /dev/null; then
-        wine64 ../wine/"$HOST_ARCH"/makepri.exe new /pr "$WORK_DIR"/wsa/pri /in MicrosoftCorporationII.WindowsSubsystemForAndroid /cf "$WORK_DIR"/wsa/priconfig.xml /of "$WORK_DIR"/wsa/"$ARCH"/resources.pri /o
-    else
+    if [ -f /proc/sys/fs/binfmt_misc/WSLInterop ]; then
         ../wine/"$HOST_ARCH"/makepri.exe new /pr "$(wslpath -w "$WORK_DIR"/wsa/pri)" /in MicrosoftCorporationII.WindowsSubsystemForAndroid /cf "$(wslpath -w "$WORK_DIR"/wsa/priconfig.xml)" /of "$(wslpath -w "$WORK_DIR"/wsa/"$ARCH"/resources.pri)" /o
+    elif which wine64 > /dev/null; then
+        wine64 ../wine/"$HOST_ARCH"/makepri.exe new /pr "$WORK_DIR"/wsa/pri /in MicrosoftCorporationII.WindowsSubsystemForAndroid /cf "$WORK_DIR"/wsa/priconfig.xml /of "$WORK_DIR"/wsa/"$ARCH"/resources.pri /o
     fi
     sed -i -zE "s/<Resources.*Resources>/<Resources>\n$(cat "$WORK_DIR"/wsa/xml/* | grep -Po '<Resource [^>]*/>' | sed ':a;N;$!ba;s/\n/\\n/g' | sed 's/\$/\\$/g' | sed 's/\//\\\//g')\n<\/Resources>/g" "$WORK_DIR"/wsa/"$ARCH"/AppxManifest.xml
     echo -e "Merge Language Resources done\n"
diff --git a/scripts/run.sh b/scripts/run.sh
index 32fb5dd..892fb5e 100755
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -46,8 +46,6 @@ check_dependencies() {
     command -v lzip >/dev/null 2>&1 || NEED_INSTALL+=("lzip")
     if [ ! -f /proc/sys/fs/binfmt_misc/WSLInterop ]; then
         command -v wine64 >/dev/null 2>&1 || NEED_INSTALL+=("wine")
-    fi
-    if [ ! -f /proc/sys/fs/binfmt_misc/WSLInterop ] || which wine64 > /dev/null; then
         command -v winetricks >/dev/null 2>&1 || NEED_INSTALL+=("winetricks")
     fi
     command -v patchelf >/dev/null 2>&1 || NEED_INSTALL+=("patchelf")
@@ -126,7 +124,7 @@ if [ -n "${NEED_INSTALL[*]}" ]; then
 fi
 pip list --disable-pip-version-check | grep -E "^requests " >/dev/null 2>&1 || python3 -m pip install requests
 
-if [ ! -f /proc/sys/fs/binfmt_misc/WSLInterop ] || which wine64 > /dev/null; then
+if [ ! -f /proc/sys/fs/binfmt_misc/WSLInterop ] && which wine64 > /dev/null; then
     winetricks list-installed | grep -E "^msxml6" >/dev/null 2>&1 || {
         cp -r ../wine/.cache/* ~/.cache
         winetricks msxml6 || abort