summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:05:16 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:22:26 +0100
commitf314791fa2fa3e6a557ca50ecb4a0cf7798fee79 (patch)
tree1289402c2df38afa3f1f70c7e40fe4f35835d670 /functions
parentc79ab34a7c597c9e3ab202c644121c6944789424 (diff)
downloadlive-build-f314791fa2fa3e6a557ca50ecb4a0cf7798fee79.zip
live-build-f314791fa2fa3e6a557ca50ecb4a0cf7798fee79.tar.gz
Adding live-helper 1.0~a20-1.
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/common.sh2
-rwxr-xr-xfunctions/defaults.sh3
-rwxr-xr-xfunctions/templates.sh10
3 files changed, 6 insertions, 9 deletions
diff --git a/functions/common.sh b/functions/common.sh
index 24212c4..d9d63a7 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -10,4 +10,4 @@
set -e
PROGRAM="`basename ${0}`"
-VERSION="1.0~a19"
+VERSION="1.0~a20"
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 098a87f..ff2f408 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -511,9 +511,6 @@ Set_defaults ()
# Setting packages list string
LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS:-standard}"
- # Setting package preseed
- # LIVE_PRESEED
-
# Setting tasks string
for LIST in ${LIVE_PACKAGES_LISTS}
do
diff --git a/functions/templates.sh b/functions/templates.sh
index 6b60c9e..54f81c1 100755
--- a/functions/templates.sh
+++ b/functions/templates.sh
@@ -11,10 +11,10 @@ set -e
Check_templates ()
{
- ITEM="${1}"
+ PACKAGE="${1}"
# Check user defined templates directory
- if [ ! -d "${LIVE_TEMPLATES}" ]
+ if [ ! -e "${LIVE_TEMPLATES}" ]
then
if [ -d config/templates ]
then
@@ -25,11 +25,11 @@ Check_templates ()
fi
fi
- if [ -d "${LIVE_TEMPLATES}/${ITEM}" ]
+ if [ -d "${LIVE_TEMPLATES}/${PACKAGE}" ]
then
- TEMPLATES="${LIVE_TEMPLATES}/${ITEM}"
+ TEMPLATES="${LIVE_TEMPLATES}/${PACKAGE}"
else
- Echo_error "${ITEM} templates not accessible in ${LIVE_TEMPLATES}"
+ Echo_error "${PACKAGE} templates not accessible in ${LIVE_TEMPLATES}"
exit 1
fi
}