Fix dependencies install

Forget to update package list before install
This commit is contained in:
Howard Wu 2023-04-17 18:49:34 +08:00
parent 8337c73a1e
commit d8194364fa
2 changed files with 27 additions and 25 deletions

View File

@ -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() {

View File

@ -101,11 +101,14 @@ 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
fi
if [ -n "${NEED_INSTALL[*]}" ]; then
if [ "$PM" = "zypper" ]; then if [ "$PM" = "zypper" ]; then
NEED_INSTALL_FIX=${NEED_INSTALL[*]} NEED_INSTALL_FIX=${NEED_INSTALL[*]}
{ {
@ -122,7 +125,7 @@ if [ -n "${NEED_INSTALL[*]}" ]; then
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
fi
if ! ($SUDO "$PM" "${UPDATE_OPTION[@]}" && $SUDO "$PM" "${UPGRADE_OPTION[@]}" ca-certificates); then abort; fi
python3 -m pip install -r requirements.txt -q python3 -m pip install -r requirements.txt -q