mirror of
https://github.com/LSPosed/MagiskOnWSALocal.git
synced 2025-05-06 23:06:34 +08:00
Fix dependencies install
Forget to update package list before install
This commit is contained in:
parent
8337c73a1e
commit
d8194364fa
@ -38,8 +38,7 @@ SYSTEM_MNT="$ROOT_MNT/system"
|
|||||||
VENDOR_MNT="$ROOT_MNT/vendor"
|
VENDOR_MNT="$ROOT_MNT/vendor"
|
||||||
PRODUCT_MNT="$ROOT_MNT/product"
|
PRODUCT_MNT="$ROOT_MNT/product"
|
||||||
SYSTEM_EXT_MNT="$ROOT_MNT/system_ext"
|
SYSTEM_EXT_MNT="$ROOT_MNT/system_ext"
|
||||||
SUDO=""
|
SUDO="$(which sudo 2>/dev/null)"
|
||||||
command -v sudo >/dev/null 2>&1 && SUDO="$(which sudo 2>/dev/null)"
|
|
||||||
DOWNLOAD_DIR=../download
|
DOWNLOAD_DIR=../download
|
||||||
DOWNLOAD_CONF_NAME=download.list
|
DOWNLOAD_CONF_NAME=download.list
|
||||||
umount_clean() {
|
umount_clean() {
|
||||||
|
@ -101,28 +101,31 @@ check_package_manager() {
|
|||||||
|
|
||||||
check_package_manager
|
check_package_manager
|
||||||
require_su
|
require_su
|
||||||
if [ -n "${NEED_INSTALL[*]}" ]; then
|
if [ -z "$PM" ]; then
|
||||||
if [ -z "$PM" ]; then
|
echo "Unable to determine package manager: Unsupported distros"
|
||||||
echo "Unable to determine package manager: Unsupported distros"
|
abort
|
||||||
abort
|
else
|
||||||
else
|
if ! ($SUDO "$PM" "${UPDATE_OPTION[@]}" && $SUDO "$PM" "${UPGRADE_OPTION[@]}" ca-certificates); then abort; fi
|
||||||
if [ "$PM" = "zypper" ]; then
|
|
||||||
NEED_INSTALL_FIX=${NEED_INSTALL[*]}
|
|
||||||
{
|
|
||||||
NEED_INSTALL_FIX=${NEED_INSTALL_FIX//setools/setools-console} 2>&1
|
|
||||||
NEED_INSTALL_FIX=${NEED_INSTALL_FIX//whiptail/dialog} 2>&1
|
|
||||||
NEED_INSTALL_FIX=${NEED_INSTALL_FIX//qemu-utils/qemu-tools} 2>&1
|
|
||||||
} >>/dev/null
|
|
||||||
|
|
||||||
readarray -td ' ' NEED_INSTALL <<<"$NEED_INSTALL_FIX "
|
|
||||||
unset 'NEED_INSTALL[-1]'
|
|
||||||
elif [ "$PM" = "apk" ]; then
|
|
||||||
NEED_INSTALL_FIX=${NEED_INSTALL[*]}
|
|
||||||
readarray -td ' ' NEED_INSTALL <<<"${NEED_INSTALL_FIX//p7zip-full/p7zip} "
|
|
||||||
unset 'NEED_INSTALL[-1]'
|
|
||||||
fi
|
|
||||||
if ! ($SUDO "$PM" "${INSTALL_OPTION[@]}" "${NEED_INSTALL[@]}"); then abort; fi
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
if ! ($SUDO "$PM" "${UPDATE_OPTION[@]}" && $SUDO "$PM" "${UPGRADE_OPTION[@]}" ca-certificates); then abort; fi
|
|
||||||
|
if [ -n "${NEED_INSTALL[*]}" ]; then
|
||||||
|
if [ "$PM" = "zypper" ]; then
|
||||||
|
NEED_INSTALL_FIX=${NEED_INSTALL[*]}
|
||||||
|
{
|
||||||
|
NEED_INSTALL_FIX=${NEED_INSTALL_FIX//setools/setools-console} 2>&1
|
||||||
|
NEED_INSTALL_FIX=${NEED_INSTALL_FIX//whiptail/dialog} 2>&1
|
||||||
|
NEED_INSTALL_FIX=${NEED_INSTALL_FIX//qemu-utils/qemu-tools} 2>&1
|
||||||
|
} >>/dev/null
|
||||||
|
|
||||||
|
readarray -td ' ' NEED_INSTALL <<<"$NEED_INSTALL_FIX "
|
||||||
|
unset 'NEED_INSTALL[-1]'
|
||||||
|
elif [ "$PM" = "apk" ]; then
|
||||||
|
NEED_INSTALL_FIX=${NEED_INSTALL[*]}
|
||||||
|
readarray -td ' ' NEED_INSTALL <<<"${NEED_INSTALL_FIX//p7zip-full/p7zip} "
|
||||||
|
unset 'NEED_INSTALL[-1]'
|
||||||
|
fi
|
||||||
|
if ! ($SUDO "$PM" "${INSTALL_OPTION[@]}" "${NEED_INSTALL[@]}"); then abort; fi
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
python3 -m pip install -r requirements.txt -q
|
python3 -m pip install -r requirements.txt -q
|
||||||
|
Loading…
x
Reference in New Issue
Block a user