From 847a336923cf9a65cdbbce4072ebbe10724b9d29 Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Wed, 22 Feb 2017 22:16:04 +0800 Subject: [PATCH] Quickfixes --- lib/util-base.sh | 4 ---- lib/util-menu.sh | 4 ---- lib/util.sh | 3 +-- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/lib/util-base.sh b/lib/util-base.sh index 82e717a..7638743 100644 --- a/lib/util-base.sh +++ b/lib/util-base.sh @@ -484,10 +484,6 @@ bios_bootloader() { install_bootloader() { check_mount - - # Set the default PATH variable - arch_chroot "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/core_perl" 2>$ERR - check_for_error "set PATH" "$?" if [[ $SYSTEM == "BIOS" ]]; then bios_bootloader diff --git a/lib/util-menu.sh b/lib/util-menu.sh index 93ce864..1645a3a 100644 --- a/lib/util-menu.sh +++ b/lib/util-menu.sh @@ -157,10 +157,6 @@ install_graphics_menu() { config_base_menu() { local PARENT="$FUNCNAME" - # Set the default PATH variable - arch_chroot "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/core_perl" 2>$ERR - check_for_error check_for_error "$FUNCNAME" "$?" - submenu 8 DIALOG "$_ConfBseBody" --default-item ${HIGHLIGHT_SUB} --menu " $_ConfBseMenuTitle " \ 0 0 8 \ diff --git a/lib/util.sh b/lib/util.sh index 2ec483d..817ac90 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -356,6 +356,5 @@ inst_needed() { # install a pkg in the chroot if not installed check_pkg() { - arch_chroot "[[ ! $(pacman -Q $1 2>/dev/null) ]] && pacman -Sy --noconfirm $1" 2>$ERR - check_for_error "install missing pkg $1 to target." "$?" + [[ -e "/mnt/usr/bin/$1" ]] || echo "$1 is not installed." && echo && echo && echo "Press enter to continue" && read }