diff --git a/scripts/build.sh b/scripts/build.sh index e23e06c..57d420a 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -38,8 +38,7 @@ SYSTEM_MNT="$ROOT_MNT/system" VENDOR_MNT="$ROOT_MNT/vendor" PRODUCT_MNT="$ROOT_MNT/product" SYSTEM_EXT_MNT="$ROOT_MNT/system_ext" -SUDO="" -command -v sudo >/dev/null 2>&1 && SUDO="$(which sudo 2>/dev/null)" +SUDO="$(which sudo 2>/dev/null)" DOWNLOAD_DIR=../download DOWNLOAD_CONF_NAME=download.list umount_clean() { diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh index a25e36c..3a0a8b7 100755 --- a/scripts/install_deps.sh +++ b/scripts/install_deps.sh @@ -101,28 +101,31 @@ check_package_manager() { check_package_manager require_su -if [ -n "${NEED_INSTALL[*]}" ]; then - if [ -z "$PM" ]; then - echo "Unable to determine package manager: Unsupported distros" - abort - else - 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 +if [ -z "$PM" ]; then + echo "Unable to determine package manager: Unsupported distros" + abort +else + if ! ($SUDO "$PM" "${UPDATE_OPTION[@]}" && $SUDO "$PM" "${UPGRADE_OPTION[@]}" ca-certificates); then abort; 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