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

Fix Python dependency installation

Browse Source 
Always use it when a virtual environment exists
This commit is contained in:
Howard Wu 2023-05-26 16:12:04 +08:00
parent 3d819b9ba5
commit b38fe8c678
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/build.sh
View File

@ -72,7 +72,7 @@ umount_clean() {
unset TMPDIR unset TMPDIR
fi fi
rm -f "${DOWNLOAD_DIR:?}/$DOWNLOAD_CONF_NAME" rm -f "${DOWNLOAD_DIR:?}/$DOWNLOAD_CONF_NAME"
if [ "$(which python)" == "$PYTHON_VENV_DIR/bin/python" ]; then if [ "$(python3 -c 'import sys ; print( 0 if sys.prefix == sys.base_prefix else 1 )')" = "1" ]; then
echo "deactivate python3 venv" echo "deactivate python3 venv"
deactivate deactivate
fi fi
@ -429,7 +429,7 @@ fi
require_su() { require_su() {
if test "$(id -u)" != "0"; then if test "$(id -u)" != "0"; then
if [ "$(sudo id -u)" != "0" ]; then if [ "$(sudo id -u)" != "0" ]; then
abort "ROOT/SUDO is required to run this script" abort "sudo is required to run this script"
fi fi
fi fi
} }

41
scripts/install_deps.sh
View File

@ -23,7 +23,6 @@ if [ ! "$BASH_VERSION" ]; then
exit 1 exit 1
fi fi
cd "$(dirname "$0")" || exit 1 cd "$(dirname "$0")" || exit 1
SUDO="$(which sudo 2>/dev/null)"
abort() { abort() {
[ "$1" ] && echo "ERROR: $1" [ "$1" ] && echo "ERROR: $1"
echo "Dependencies: an error has occurred, exit" echo "Dependencies: an error has occurred, exit"
@ -31,8 +30,8 @@ abort() {
} }
require_su() { require_su() {
if test "$(id -u)" != "0"; then if test "$(id -u)" != "0"; then
if [ -z "$SUDO" ] && [ "$($SUDO id -u)" != "0" ]; then if [ "$(sudo id -u)" != "0" ]; then
echo "ROOT/SUDO is required to run this script" echo "sudo is required to run this script"
abort abort
fi fi
fi fi
@ -50,7 +49,6 @@ check_dependencies() {
command -v setfattr >/dev/null 2>&1 || NEED_INSTALL+=("attr") command -v setfattr >/dev/null 2>&1 || NEED_INSTALL+=("attr")
command -v unzip >/dev/null 2>&1 || NEED_INSTALL+=("unzip") command -v unzip >/dev/null 2>&1 || NEED_INSTALL+=("unzip")
command -v qemu-img >/dev/null 2>&1 || NEED_INSTALL+=("qemu-utils") command -v qemu-img >/dev/null 2>&1 || NEED_INSTALL+=("qemu-utils")
command -v sudo >/dev/null 2>&1 || NEED_INSTALL+=("sudo")
} }
check_dependencies check_dependencies
osrel=$(sed -n '/^ID_LIKE=/s/^.*=//p' /etc/os-release) osrel=$(sed -n '/^ID_LIKE=/s/^.*=//p' /etc/os-release)
@ -117,14 +115,14 @@ elif [ "$PM" = "pacman" ]; then
echo "$answer" echo "$answer"
case "$answer" in case "$answer" in
Yes) Yes)
if ! ($SUDO "$PM" "${UPDATE_OPTION[@]}" ca-certificates); then abort; fi if ! (sudo "$PM" "${UPDATE_OPTION[@]}" ca-certificates); then abort; fi
;; ;;
*) *)
abort "Operation cancelled by user" abort "Operation cancelled by user"
;; ;;
esac esac
else else
if ! ($SUDO "$PM" "${UPDATE_OPTION[@]}" && $SUDO "$PM" "${UPGRADE_OPTION[@]}" ca-certificates); then abort; fi if ! (sudo "$PM" "${UPDATE_OPTION[@]}" && sudo "$PM" "${UPGRADE_OPTION[@]}" ca-certificates); then abort; fi
fi fi
if [ -n "${NEED_INSTALL[*]}" ]; then if [ -n "${NEED_INSTALL[*]}" ]; then
@ -134,7 +132,6 @@ if [ -n "${NEED_INSTALL[*]}" ]; then
NEED_INSTALL_FIX=${NEED_INSTALL_FIX//setools/setools-console} 2>&1 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//whiptail/dialog} 2>&1
NEED_INSTALL_FIX=${NEED_INSTALL_FIX//qemu-utils/qemu-tools} 2>&1 NEED_INSTALL_FIX=${NEED_INSTALL_FIX//qemu-utils/qemu-tools} 2>&1
NEED_INSTALL_FIX=${NEED_INSTALL_FIX//python3-venv/python3-venvctrl} 2>&1
} >>/dev/null } >>/dev/null
readarray -td ' ' NEED_INSTALL <<<"$NEED_INSTALL_FIX " readarray -td ' ' NEED_INSTALL <<<"$NEED_INSTALL_FIX "
@ -155,18 +152,34 @@ if [ -n "${NEED_INSTALL[*]}" ]; then
readarray -td ' ' NEED_INSTALL <<<"$NEED_INSTALL_FIX " readarray -td ' ' NEED_INSTALL <<<"$NEED_INSTALL_FIX "
unset 'NEED_INSTALL[-1]' unset 'NEED_INSTALL[-1]'
fi fi
if ! ($SUDO "$PM" "${INSTALL_OPTION[@]}" "${NEED_INSTALL[@]}"); then abort; fi if ! (sudo "$PM" "${INSTALL_OPTION[@]}" "${NEED_INSTALL[@]}"); then abort; fi
fi fi
python_version=$(python3 -c 'import sys;print("{0}{1}".format(*(sys.version_info[:2])))') python_version=$(python3 -c 'import sys;print("{0}{1}".format(*(sys.version_info[:2])))')
if [ "$python_version" -ge 311 ]; then PYTHON_VENV_DIR="$(dirname "$PWD")/python3-env"
python3 -c "import venv" >/dev/null 2>&1 || if ! ($SUDO "$PM" "${INSTALL_OPTION[@]}" "python3-venv"); then abort; fi if [ "$python_version" -ge 311 ] || [ -f "$PYTHON_VENV_DIR/bin/activate" ]; then
PYTHON_VENV_DIR="$(dirname "$PWD")/python3-env" python3 -c "import venv" >/dev/null 2>&1 || {
[ -f "$PYTHON_VENV_DIR/bin/activate" ] || { case "$PM" in
echo "Creating python3 virtual env" zypper)
python3 -m venv "$PYTHON_VENV_DIR" || abort "Failed to create python3 virtual env" if ! (sudo "$PM" "${INSTALL_OPTION[@]}" "python3-venvctrl"); then
abort
fi
;;
*)
if ! (sudo "$PM" "${INSTALL_OPTION[@]}" "python3-venv"); then
abort
fi
;;
esac
} }
echo "Creating python3 virtual env"
python3 -m venv --system-site-packages "$PYTHON_VENV_DIR" || {
echo "Failed to upgrade python3 virtual env, clear and recreate"
python3 -m venv --clear --system-site-packages "$PYTHON_VENV_DIR" || abort "Failed to create python3 virtual env"
}
fi
if [ -f "$PYTHON_VENV_DIR/bin/activate" ]; then
# shellcheck disable=SC1091 # shellcheck disable=SC1091
source "$PYTHON_VENV_DIR"/bin/activate || abort "Failed to activate python3 virtual env" source "$PYTHON_VENV_DIR"/bin/activate || abort "Failed to activate python3 virtual env"
python3 -c "import pkg_resources; pkg_resources.require(open('requirements.txt',mode='r'))" &>/dev/null || { python3 -c "import pkg_resources; pkg_resources.require(open('requirements.txt',mode='r'))" &>/dev/null || {