QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed typo of SCRIPTSDIR var

Browse Source
This commit is contained in:
Jason Mehring 2014-10-21 10:00:32 -04:00
parent f597ff760f
commit 4ad8522455
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
functions.sh
View File

@ -148,11 +148,11 @@ customStepExec() {
local template_flavor_dir="$4" local template_flavor_dir="$4"
local template_flavor_prefix="$5" local template_flavor_prefix="$5"
[[ -z $TEST ]] && echo "Calling script: ${calling_script}" || : [[ -z $TEST ]] && debug "Calling script: ${calling_script}" || :
[[ -z $TEST ]] && echo "Step: ${step}" || : [[ -z $TEST ]] && debug "Step: ${step}" || :
[[ -z $TEST ]] && echo "Template Flavor: ${template_flavor}" || : [[ -z $TEST ]] && debug "Template Flavor: ${template_flavor}" || :
[[ -z $TEST ]] && echo "Template Dir: ${template_flavor_dir}" || : [[ -z $TEST ]] && debug "Template Dir: ${template_flavor_dir}" || :
[[ -z $TEST ]] && echo "Template Prefix: ${template_flavor_prefix}" || : [[ -z $TEST ]] && debug "Template Prefix: ${template_flavor_prefix}" || :
splitPath "${calling_script}" path_parts splitPath "${calling_script}" path_parts
@ -216,10 +216,7 @@ customCopy() {
} }
templateFlavor() { templateFlavor() {
local template=${TEMPLATE_FLAVOR} echo ${TEMPLATE_FLAVOR}
local default="${SCRIPTSDIR}"
echo ${template:-${default}}
} }
templateFlavorPrefix() { templateFlavorPrefix() {
@ -245,7 +242,7 @@ templateFlavorDir() {
fi fi
done done
echo "${SCRIPTDIR}" echo "${SCRIPTSDIR}"
} }
customParse() { customParse() {

6
tests/template-flavors/test.sh
View File

@ -47,7 +47,7 @@ assertEnd() {
} }
# Defaults # Defaults
export SCRIPTDIR="tests/template-flavors" export SCRIPTSDIR="tests/template-flavors"
export DIST="wheezy" export DIST="wheezy"
export TEMPLATE_FLAVOR="whonix-gateway" export TEMPLATE_FLAVOR="whonix-gateway"
@ -56,7 +56,7 @@ export TEMPLATE_FLAVOR_PREFIX=""
# Just use error to show text in red # Just use error to show text in red
head "=== Globals ===" head "=== Globals ==="
debug 'export SCRIPTDIR="tests/template-flavors"' debug 'export SCRIPTSDIR="tests/template-flavors"'
debug 'export DIST="wheezy"' debug 'export DIST="wheezy"'
debug 'export TEMPLATE_FLAVOR="whonix-gateway"' debug 'export TEMPLATE_FLAVOR="whonix-gateway"'
debug 'export TEMPLATE_FLAVOR_PREFIX=""' debug 'export TEMPLATE_FLAVOR_PREFIX=""'
@ -147,7 +147,7 @@ assertTest "customStep $0 pre" "tests/template-flavors/wheezy+whonix-gateway/tes
assertEnd "Test 7" assertEnd "Test 7"
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
export INSTALLDIR="${SCRIPTDIR}/test_copy_location" export INSTALLDIR="${SCRIPTSDIR}/test_copy_location"
head " 8. Copy files head " 8. Copy files
\n Just test copying from here to ${INSTALLDIR}" \n Just test copying from here to ${INSTALLDIR}"
TEMPLATE_FLAVOR_DIR="" TEMPLATE_FLAVOR_DIR=""