summaryrefslogtreecommitdiff
path: root/helpers/lh_chroot_local-includes
diff options
context:
space:
mode:
Diffstat (limited to 'helpers/lh_chroot_local-includes')
-rwxr-xr-xhelpers/lh_chroot_local-includes16
1 files changed, 8 insertions, 8 deletions
diff --git a/helpers/lh_chroot_local-includes b/helpers/lh_chroot_local-includes
index 0d94703..329c566 100755
--- a/helpers/lh_chroot_local-includes
+++ b/helpers/lh_chroot_local-includes
@@ -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="copy local files 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-includes: Init"
+Echo_message "Begin copying chroot local includes..."
# 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-includes/* &> /dev/null
+if ls config/chroot_local-includes/* > /dev/null 2>&1
then
# Copying includes
cd config/chroot_local-includes