diff options
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/common.sh | 2 | ||||
| -rwxr-xr-x | functions/defaults.sh | 3 | ||||
| -rwxr-xr-x | functions/templates.sh | 10 |
3 files changed, 6 insertions, 9 deletions
diff --git a/functions/common.sh b/functions/common.sh index 24212c4fd..d9d63a744 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 098a87f23..ff2f4086e 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 6b60c9e9a..54f81c1e7 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 } |