august/MagiskOnWSALocal
1
0
Fork 0
mirror of https://github.com/LSPosed/MagiskOnWSALocal.git synced 2025-05-06 14:56:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support no wine execution in WSL (#308)

Browse Source 
Closes #306
This commit is contained in:
4qwerty7 2023-01-02 15:51:04 +08:00 committed by GitHub
parent 39d51aaf44
commit c143787681
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/build.sh
View File

@ -647,7 +647,11 @@ cp "$WORK_DIR"/wsa/"$ARCH"/resources.pri "$WORK_DIR"/wsa/pri/en-us.pri \
</index> </index>
</resources> </resources>
EOF EOF
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 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
../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
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 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" echo -e "Merge Language Resources done\n"
} || echo -e "Merge Language Resources failed\n" } || echo -e "Merge Language Resources failed\n"

20
scripts/run.sh
View File

@ -44,8 +44,12 @@ check_dependencies() {
command -v whiptail >/dev/null 2>&1 || command -v dialog >/dev/null 2>&1 || NEED_INSTALL+=("whiptail") command -v whiptail >/dev/null 2>&1 || command -v dialog >/dev/null 2>&1 || NEED_INSTALL+=("whiptail")
command -v seinfo >/dev/null 2>&1 || NEED_INSTALL+=("setools") command -v seinfo >/dev/null 2>&1 || NEED_INSTALL+=("setools")
command -v lzip >/dev/null 2>&1 || NEED_INSTALL+=("lzip") command -v lzip >/dev/null 2>&1 || NEED_INSTALL+=("lzip")
command -v wine64 >/dev/null 2>&1 || NEED_INSTALL+=("wine") if [ ! -f /proc/sys/fs/binfmt_misc/WSLInterop ]; then
command -v winetricks >/dev/null 2>&1 || NEED_INSTALL+=("winetricks") 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") command -v patchelf >/dev/null 2>&1 || NEED_INSTALL+=("patchelf")
command -v resize2fs >/dev/null 2>&1 || NEED_INSTALL+=("e2fsprogs") command -v resize2fs >/dev/null 2>&1 || NEED_INSTALL+=("e2fsprogs")
command -v pip >/dev/null 2>&1 || NEED_INSTALL+=("python3-pip") command -v pip >/dev/null 2>&1 || NEED_INSTALL+=("python3-pip")
@ -122,10 +126,12 @@ if [ -n "${NEED_INSTALL[*]}" ]; then
fi fi
pip list --disable-pip-version-check | grep -E "^requests " >/dev/null 2>&1 || python3 -m pip install requests pip list --disable-pip-version-check | grep -E "^requests " >/dev/null 2>&1 || python3 -m pip install requests
winetricks list-installed | grep -E "^msxml6" >/dev/null 2>&1 || { if [ ! -f /proc/sys/fs/binfmt_misc/WSLInterop ] || which wine64 > /dev/null; then
cp -r ../wine/.cache/* ~/.cache winetricks list-installed | grep -E "^msxml6" >/dev/null 2>&1 || {
winetricks msxml6 || abort cp -r ../wine/.cache/* ~/.cache
} winetricks msxml6 || abort
}
fi
WHIPTAIL=$(command -v whiptail 2>/dev/null) WHIPTAIL=$(command -v whiptail 2>/dev/null)
DIALOG=$(command -v dialog 2>/dev/null) DIALOG=$(command -v dialog 2>/dev/null)
DIALOG=${WHIPTAIL:-$DIALOG} DIALOG=${WHIPTAIL:-$DIALOG}
@ -186,7 +192,7 @@ if (YesNoBox '([title]="Install GApps" [text]="Do you want to install GApps?")')
else else
GAPPS_BRAND="none" GAPPS_BRAND="none"
fi fi
if [ $GAPPS_BRAND = "OpenGApps" ]; then if [ "$GAPPS_BRAND" = "OpenGApps" ]; then
# TODO: Keep it pico since other variants of opengapps are unable to boot successfully # TODO: Keep it pico since other variants of opengapps are unable to boot successfully
if [ "$DEBUG" = "1" ]; then if [ "$DEBUG" = "1" ]; then
GAPPS_VARIANT=$( GAPPS_VARIANT=$(