diff options
Diffstat (limited to 'helpers/lh_chroot_local-packages')
| -rwxr-xr-x | helpers/lh_chroot_local-packages | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/helpers/lh_chroot_local-packages b/helpers/lh_chroot_local-packages index 07c9eb2e3..fd4269597 100755 --- a/helpers/lh_chroot_local-packages +++ b/helpers/lh_chroot_local-packages @@ -9,21 +9,21 @@ set -e -# Source common functions -for FUNCTION in /usr/share/live-helper/functions/*.sh +# Including common functions +LH_BASE="${LH_BASE:-/usr/share/live-helper}" + +for FUNCTION in "${LH_BASE}"/functions/*.sh do - . ${FUNCTION} + . "${FUNCTION}" done -# Set static variables +# Setting static variables DESCRIPTION="install local packages into chroot" HELP="" USAGE="${PROGRAM} [--force]" Arguments "${@}" -Echo_debug "Init ${PROGRAM}" - # Reading configuration files Read_conffile config/common Read_conffile config/bootstrap @@ -32,7 +32,7 @@ Read_conffile config/binary Read_conffile config/source Set_defaults -Breakpoint "chroot_local-packages: Init" +Echo_message "Begin installing local packages..." # Requiring stage file Require_stagefile .stage/bootstrap @@ -46,7 +46,7 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -if ls config/chroot_local-packages/*.deb &> /dev/null +if ls config/chroot_local-packages/*.deb > /dev/null 2>&1 then # Restoring cache Restore_cache cache/packages_local-packages |