QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
6cbac4b4e0
qubes-linux-template-builder/tests/template-flavors/test.sh

504 lines
16 KiB
Bash
Raw Normal View History

Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
#!/bin/bash
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
# vim: set ts=4 sw=4 sts=4 et :
debian: honor verbose; fixed bug where base package.list was not being used
2014-11-04 04:59:48 +00:00
VERBOSE=1
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
pushd ../..
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
ROOT_DIR=$(readlink -m .)
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
# ------------------------------------------------------------------------------
# Source external scripts
# ------------------------------------------------------------------------------
. ./functions.sh
. ./tests/assert/assert.sh
Updated tests to include tests for new features added to functions*.sh
2015-03-15 19:04:23 +00:00
set +e
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
header() {
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
echo
echo
info "------------------------------------------------------------------------------"
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
IFS= read -r title; info "${title}"
while IFS= read -r line; do
echo "${bold}${magenta}${line}${reset}"
done;
echo
values SCRIPTSDIR
values DIST
values DISTS_VM
values TEMPLATE_FLAVOR
values TEMPLATE_FLAVOR_PREFIX
values TEMPLATE_FLAVOR_DIR
values TEMPLATE_OPTIONS
echo
}
declare -A VALUES=(
[SCRIPTSDIR]=""
[DIST]=""
[DISTS_VM]=""
[TEMPLATE_FLAVOR]=""
[TEMPLATE_FLAVOR_DIR]=""
[TEMPLATE_FLAVOR_PREFIX]=""
[TEMPLATE_OPTIONS]=""
)
values() {
debian: honor verbose; fixed bug where base package.list was not being used
2014-11-04 04:59:48 +00:00
label=${1}
value="${1}[@]"
value="${!value}"
if [ "${VALUES[$label]}" == "${value}" ]; then
printf " ${bold}${magenta}%-22s = ${value}${reset}\n" "${label}" || :
else
printf " ${bold}${black}%-22s = ${value}${reset}\n" "${label}" || :
fi
VALUES[$label]="${value}"
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
}
info() {
debian: honor verbose; fixed bug where base package.list was not being used
2014-11-04 04:59:48 +00:00
output "${bold}${blue}${1}${reset}" || :
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
}
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
debug() {
debian: honor verbose; fixed bug where base package.list was not being used
2014-11-04 04:59:48 +00:00
output "${magenta}${1}${reset}" || :
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
}
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
assertTest(){
TEST=True
printf "${bold}${red}"
assert "$1" "$2"
printf "${reset}"
unset TEST
}
assertEnd() {
printf "${bold}${red}"
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
[[ -n "$1" ]] && assert_end "$1" || assert_end
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
printf "${reset}"
}
# ------------------------------------------------------------------------------
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
# 1. With TEMPLATE_FLAVOR
# ------------------------------------------------------------------------------
SCRIPTSDIR="tests/template-flavors"
DIST="wheezy"
Added ability to name tempaltes within configuration file and check/fix to make sure names under 32 characters
2014-10-24 20:17:29 +00:00
DISTS_VM=""
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
TEMPLATE_FLAVOR="whonix-gateway"
TEMPLATE_FLAVOR_PREFIX=""
Added ability to name tempaltes within configuration file and check/fix to make sure names under 32 characters
2014-10-24 20:17:29 +00:00
TEMPLATE_FLAVOR_DIR=""
TEMPLATE_OPTIONS=""
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
header <<EOF
1. With TEMPLATE_FLAVOR
EOF
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
buildStep "$0" "pre"
New tests to work with updated functions.sh
2015-02-10 15:12:53 +00:00
assertTest "buildStep $0 pre" "tests/template-flavors/wheezy+whonix-gateway/test_pre.sh\ntests/template-flavors/wheezy/test_pre.sh\ntests/template-flavors/test_pre.sh"
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
assertEnd
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
# ------------------------------------------------------------------------------
# 2. Without TEMPLATE_FLAVOR
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
# ------------------------------------------------------------------------------
Added ability to name tempaltes within configuration file and check/fix to make sure names under 32 characters
2014-10-24 20:17:29 +00:00
SCRIPTSDIR="tests/template-flavors"
DIST="wheezy"
DISTS_VM=""
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
TEMPLATE_FLAVOR=""
Added ability to name tempaltes within configuration file and check/fix to make sure names under 32 characters
2014-10-24 20:17:29 +00:00
TEMPLATE_FLAVOR_PREFIX=""
TEMPLATE_FLAVOR_DIR=""
TEMPLATE_OPTIONS=""
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
header <<EOF
2. Without TEMPLATE_FLAVOR
EOF
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
buildStep "$0" "pre"
New tests to work with updated functions.sh
2015-02-10 15:12:53 +00:00
assertTest "buildStep $0 pre" "tests/template-flavors/test_pre.sh\ntests/template-flavors/wheezy/test_pre.sh"
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
assertEnd
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
# ------------------------------------------------------------------------------
# 3. Template Options
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
# ------------------------------------------------------------------------------
Added ability to name tempaltes within configuration file and check/fix to make sure names under 32 characters
2014-10-24 20:17:29 +00:00
SCRIPTSDIR="tests/template-flavors"
DIST="wheezy"
DISTS_VM=""
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
TEMPLATE_FLAVOR="whonix-gateway"
Added ability to name tempaltes within configuration file and check/fix to make sure names under 32 characters
2014-10-24 20:17:29 +00:00
TEMPLATE_FLAVOR_PREFIX=""
TEMPLATE_FLAVOR_DIR=""
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
TEMPLATE_OPTIONS=('gnome' 'kde')
header <<EOF
3. Template Options
Options get seperated into TEMPLATE_OPTIONS seperated by spaces
EOF
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
buildStep "$0" "pre"
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
debug "Not supposed to find wheezy+whonix-gateway+kde"
New tests to work with updated functions.sh
2015-02-10 15:12:53 +00:00
assertTest "buildStep $0 pre" "tests/template-flavors/wheezy+whonix-gateway/test_pre.sh\ntests/template-flavors/wheezy/test_pre.sh\ntests/template-flavors/wheezy+whonix-gateway+gnome/test_pre.sh\ntests/template-flavors/test_pre.sh"
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
assertEnd
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
# ------------------------------------------------------------------------------
# 4. Template Options with custom prefix
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
# ------------------------------------------------------------------------------
Added ability to name tempaltes within configuration file and check/fix to make sure names under 32 characters
2014-10-24 20:17:29 +00:00
SCRIPTSDIR="tests/template-flavors"
DIST="wheezy"
DISTS_VM=""
TEMPLATE_FLAVOR="whonix-gateway"
TEMPLATE_FLAVOR_DIR=""
TEMPLATE_OPTIONS=('gnome' 'kde')
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
TEMPLATE_FLAVOR_PREFIX=(
'wheezy+whonix-gateway:debian+'
'wheezy+whonix-workstation:debian+'
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
)
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
header <<EOF
4. Template Options with custom prefix
EOF
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
buildStep "$0" "pre"
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
debug "Not supposed to find debian+whonix-gateway+kde"
New tests to work with updated functions.sh
2015-02-10 15:12:53 +00:00
assertTest "buildStep $0 pre" "tests/template-flavors/debian+whonix-gateway/test_pre.sh\ntests/template-flavors/wheezy/test_pre.sh\ntests/template-flavors/wheezy+whonix-gateway+gnome/test_pre.sh\ntests/template-flavors/test_pre.sh"
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
assertEnd
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
# ------------------------------------------------------------------------------
# 5. Template Options with NO prefix
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
# ------------------------------------------------------------------------------
Added ability to name tempaltes within configuration file and check/fix to make sure names under 32 characters
2014-10-24 20:17:29 +00:00
SCRIPTSDIR="tests/template-flavors"
DIST="wheezy"
DISTS_VM=""
TEMPLATE_FLAVOR="whonix-gateway"
TEMPLATE_FLAVOR_DIR=""
TEMPLATE_OPTIONS=('gnome' 'kde')
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
TEMPLATE_FLAVOR_PREFIX=(
'wheezy+whonix-gateway:'
'wheezy+whonix-workstation:'
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
)
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
header <<EOF
5. Template Options with NO prefix
EOF
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
buildStep "$0" "pre"
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
debug "Not supposed to find whonix-gateway+kde"
New tests to work with updated functions.sh
2015-02-10 15:12:53 +00:00
assertTest "buildStep $0 pre" "tests/template-flavors/whonix-gateway/test_pre.sh\ntests/template-flavors/wheezy/test_pre.sh\ntests/template-flavors/wheezy+whonix-gateway+gnome/test_pre.sh\ntests/template-flavors/test_pre.sh"
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
assertEnd
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
# ------------------------------------------------------------------------------
# 6. Custom template directory for options within \${SCRIPTSDIR}
# ------------------------------------------------------------------------------
Added ability to name tempaltes within configuration file and check/fix to make sure names under 32 characters
2014-10-24 20:17:29 +00:00
SCRIPTSDIR="tests/template-flavors"
DIST="wheezy"
DISTS_VM=""
TEMPLATE_FLAVOR="whonix-gateway"
TEMPLATE_FLAVOR_PREFIX=""
TEMPLATE_FLAVOR_DIR="wheezy+whonix-gateway+gnome:${SCRIPTSDIR}/another_location/whonix_gnome"
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
TEMPLATE_OPTIONS=('gnome')
header <<EOF
6. Custom template directory for options within \${SCRIPTSDIR}
NOTE: in config file you would need to use \$\${SCRIPTSDIR} or whatever variable
and in a bash file use single 'quotes' around string and \${SCRIPTSDIR}
EOF
buildStep "$0" "pre"
Reworked the way template flavor files are found to allow flavors - This better allows flavors to be within their own packages such as Whonix The previous method of discovering flavor configurations was kind of broke when using a flavor within a different package and including additional options such as +standard.
2015-04-07 23:38:43 +00:00
assertTest "buildStep $0 pre" "tests/template-flavors/wheezy+whonix-gateway/test_pre.sh\ntests/template-flavors/wheezy/test_pre.sh\ntests/template-flavors/another_location/whonix_gnome/test_pre.sh\ntests/template-flavors/test_pre.sh"
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
assertEnd
# ------------------------------------------------------------------------------
# 7. Custom template directory
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
# ------------------------------------------------------------------------------
Added ability to name tempaltes within configuration file and check/fix to make sure names under 32 characters
2014-10-24 20:17:29 +00:00
SCRIPTSDIR="tests/template-flavors"
DIST="wheezy"
DISTS_VM=""
TEMPLATE_FLAVOR="whonix-gateway"
TEMPLATE_FLAVOR_PREFIX=""
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
TEMPLATE_FLAVOR_DIR="wheezy+whonix-gateway:tests/template-flavors/another_location/whonix-gw"
Added ability to name tempaltes within configuration file and check/fix to make sure names under 32 characters
2014-10-24 20:17:29 +00:00
TEMPLATE_OPTIONS=""
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
header <<EOF
7. Custom template directory
EOF
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
buildStep "$0" "pre"
Updated tests to include tests for new features added to functions*.sh
2015-03-15 19:04:23 +00:00
assertTest "buildStep $0 pre" "tests/template-flavors/another_location/whonix-gw/test_pre.sh\ntests/template-flavors/wheezy/test_pre.sh\ntests/template-flavors/test_pre.sh"
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
assertEnd
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
# ------------------------------------------------------------------------------
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
# 8. Custom template directory with space in name
# ------------------------------------------------------------------------------
Added ability to name tempaltes within configuration file and check/fix to make sure names under 32 characters
2014-10-24 20:17:29 +00:00
SCRIPTSDIR="tests/template-flavors"
DIST="wheezy"
DISTS_VM=""
TEMPLATE_FLAVOR="whonix-gateway"
TEMPLATE_FLAVOR_PREFIX=""
Fixed some issues with Makefile TEMPLATE_* vars that were expected to be arrays or easily importable as one
2014-10-27 03:55:21 +00:00
TEMPLATE_FLAVOR_DIR=("wheezy+whonix-gateway:tests/template-flavors/another_location/whonix gw")
Added ability to name tempaltes within configuration file and check/fix to make sure names under 32 characters
2014-10-24 20:17:29 +00:00
TEMPLATE_OPTIONS=""
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
header <<EOF
8. Custom template directory with space in name
EOF
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
buildStep "$0" "pre"
Updated tests to include tests for new features added to functions*.sh
2015-03-15 19:04:23 +00:00
assertTest "buildStep $0 pre" "tests/template-flavors/another_location/whonix gw/test_pre.sh\ntests/template-flavors/wheezy/test_pre.sh\ntests/template-flavors/test_pre.sh"
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
assertEnd
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
# ------------------------------------------------------------------------------
# 9. Custom template directory for options
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
# ------------------------------------------------------------------------------
Added ability to name tempaltes within configuration file and check/fix to make sure names under 32 characters
2014-10-24 20:17:29 +00:00
SCRIPTSDIR="tests/template-flavors"
DIST="wheezy"
DISTS_VM=""
TEMPLATE_FLAVOR="whonix-gateway"
TEMPLATE_FLAVOR_PREFIX=""
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
TEMPLATE_FLAVOR_DIR="wheezy+whonix-gateway+gnome:tests/template-flavors/another_location/whonix_gnome"
Added ability to name tempaltes within configuration file and check/fix to make sure names under 32 characters
2014-10-24 20:17:29 +00:00
TEMPLATE_OPTIONS=('gnome')
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
header <<EOF
9. Custom template directory for options
EOF
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
buildStep "$0" "pre"
Reworked the way template flavor files are found to allow flavors - This better allows flavors to be within their own packages such as Whonix The previous method of discovering flavor configurations was kind of broke when using a flavor within a different package and including additional options such as +standard.
2015-04-07 23:38:43 +00:00
assertTest "buildStep $0 pre" "tests/template-flavors/wheezy+whonix-gateway/test_pre.sh\ntests/template-flavors/wheezy/test_pre.sh\ntests/template-flavors/another_location/whonix_gnome/test_pre.sh\ntests/template-flavors/test_pre.sh"
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
assertEnd
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
# ------------------------------------------------------------------------------
Code cleanup - whonix* not tested
2014-10-28 08:09:55 +00:00
# 10. Template directory for options within ${SCRIPTSDIR} using short name filter
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
# ------------------------------------------------------------------------------
Added ability to name tempaltes within configuration file and check/fix to make sure names under 32 characters
2014-10-24 20:17:29 +00:00
SCRIPTSDIR="tests/template-flavors"
DIST="wheezy"
DISTS_VM=""
TEMPLATE_FLAVOR="whonix-gateway"
TEMPLATE_FLAVOR_PREFIX=""
TEMPLATE_FLAVOR_DIR="wheezy+proxy:${SCRIPTSDIR}/proxy"
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
TEMPLATE_OPTIONS=('proxy')
header <<EOF
Code cleanup - whonix* not tested
2014-10-28 08:09:55 +00:00
10. Template directory for options within ${SCRIPTSDIR} using short name filter
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
EOF
buildStep "$0" "pre"
New tests to work with updated functions.sh
2015-02-10 15:12:53 +00:00
assertTest "buildStep $0 pre" "tests/template-flavors/wheezy+whonix-gateway/test_pre.sh\ntests/template-flavors/wheezy/test_pre.sh\ntests/template-flavors/proxy/test_pre.sh\ntests/template-flavors/test_pre.sh"
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
assertEnd
# ------------------------------------------------------------------------------
# 11. Template directory for options within using VERY short name filter (+proxy)
# ------------------------------------------------------------------------------
Added ability to name tempaltes within configuration file and check/fix to make sure names under 32 characters
2014-10-24 20:17:29 +00:00
SCRIPTSDIR="tests/template-flavors"
DIST="wheezy"
DISTS_VM=""
TEMPLATE_FLAVOR="whonix-gateway"
TEMPLATE_FLAVOR_PREFIX=""
TEMPLATE_FLAVOR_DIR="+proxy:${SCRIPTSDIR}/proxy"
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
TEMPLATE_OPTIONS=('proxy')
header <<EOF
11. Template directory for options within using VERY short name filter (+proxy)
EOF
buildStep "$0" "pre"
New tests to work with updated functions.sh
2015-02-10 15:12:53 +00:00
assertTest "buildStep $0 pre" "tests/template-flavors/wheezy+whonix-gateway/test_pre.sh\ntests/template-flavors/wheezy/test_pre.sh\ntests/template-flavors/proxy/test_pre.sh\ntests/template-flavors/test_pre.sh"
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
assertEnd
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
# ------------------------------------------------------------------------------
Added ability to name tempaltes within configuration file and check/fix to make sure names under 32 characters
2014-10-24 20:17:29 +00:00
# 12. Template Name - Custom
# ------------------------------------------------------------------------------
SCRIPTSDIR="tests/template-flavors"
DIST="wheezy"
DISTS_VM=""
TEMPLATE_FLAVOR="whonix-gateway"
TEMPLATE_FLAVOR_PREFIX=""
TEMPLATE_FLAVOR_DIR=""
TEMPLATE_OPTIONS=""
TEMPLATE_LABEL="wheezy+whonix-gateway:whonix-gateway"
header <<EOF
12. Template Name - Custom
TEMPLATE_LABEL = wheezy+whonix-gateway:whonix-gateway
EOF
info "Template name: $(templateName)"
assertTest "templateName" "whonix-gateway"
assertEnd
# ------------------------------------------------------------------------------
# 13. Template Name - Custom with sub-options
# ------------------------------------------------------------------------------
SCRIPTSDIR="tests/template-flavors"
DIST="wheezy"
DISTS_VM=""
TEMPLATE_FLAVOR="whonix-gateway"
TEMPLATE_FLAVOR_PREFIX=""
TEMPLATE_FLAVOR_DIR=""
TEMPLATE_OPTIONS=('proxy')
TEMPLATE_LABEL="wheezy+whonix-gateway+proxy:whonix-gateway"
header <<EOF
13. Template Name - Custom with sub-options
TEMPLATE_LABEL = wheezy+whonix-gateway+proxy:whonix-gateway
EOF
info "Template name: $(templateName)"
assertTest "templateName" "whonix-gateway"
assertEnd
# ------------------------------------------------------------------------------
# 14. Template Name - NO template
# ------------------------------------------------------------------------------
SCRIPTSDIR="tests/template-flavors"
DIST="wheezy"
DISTS_VM=""
TEMPLATE_FLAVOR=""
TEMPLATE_FLAVOR_PREFIX=""
TEMPLATE_FLAVOR_DIR=""
TEMPLATE_OPTIONS=""
TEMPLATE_LABEL="wheezy:debian-7"
header <<EOF
14. Template Name - NO template
TEMPLATE_LABEL = wheezy:debian-7
EOF
info "Template name: $(templateName)"
assertTest "templateName" "debian-7"
assertEnd
Updated tests to include tests for new features added to functions*.sh
2015-03-15 19:04:23 +00:00
# ------------------------------------------------------------------------------
# 15. Template Name - containsFlavor
# ------------------------------------------------------------------------------
SCRIPTSDIR="tests/template-flavors"
DIST="wheezy"
DISTS_VM=""
TEMPLATE_FLAVOR="whonix-gateway"
TEMPLATE_FLAVOR_PREFIX=""
TEMPLATE_FLAVOR_DIR=""
TEMPLATE_OPTIONS=('proxy' 'minimal' 'flash' 'gnome')
TEMPLATE_LABEL=""
header <<EOF
15. Template Name - containsFlavor
containsFlavor flash
containsFlavor whonix-gateway
EOF
assert_raises "containsFlavor flash"
assert_raises "containsFlavor whonix-gateway"
assertEnd
# ------------------------------------------------------------------------------
# 16. Long Template Name
# ------------------------------------------------------------------------------
SCRIPTSDIR="tests/template-flavors"
DIST="wheezy"
DISTS_VM=""
TEMPLATE_FLAVOR="tor-gateway"
TEMPLATE_FLAVOR_PREFIX=""
TEMPLATE_FLAVOR_DIR=""
TEMPLATE_OPTIONS=""
TEMPLATE_OPTIONS=('minimal' 'proxy' 'flash' 'gnome' 'standard')
header <<EOF
16. Long Template Name
EOF
info "Template name: $(templateName)"
assertTest "templateName" "wheezy+tor-gateway+minimal"
assertEnd
Added ability to name tempaltes within configuration file and check/fix to make sure names under 32 characters
2014-10-24 20:17:29 +00:00
# ------------------------------------------------------------------------------
Updated tests to include tests for new features added to functions*.sh
2015-03-15 19:04:23 +00:00
# 17. Configuration Files
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
# ------------------------------------------------------------------------------
Added ability to name tempaltes within configuration file and check/fix to make sure names under 32 characters
2014-10-24 20:17:29 +00:00
SCRIPTSDIR="tests/template-flavors"
DIST="wheezy"
DISTS_VM=""
TEMPLATE_FLAVOR="whonix-gateway"
TEMPLATE_FLAVOR_PREFIX=""
Fixed some issues with Makefile TEMPLATE_* vars that were expected to be arrays or easily importable as one
2014-10-27 03:55:21 +00:00
TEMPLATE_FLAVOR_DIR=(
'wheezy+whonix-gateway:tests/template-flavors/another_location/whonix gw'
'+gnome:$${SCRIPTSDIR}/gnome'
)
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
TEMPLATE_OPTIONS=('gnome')
header <<EOF
Updated tests to include tests for new features added to functions*.sh
2015-03-15 19:04:23 +00:00
17. Configuration Files
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
Find packages.list for every template available
EOF
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
getFileLocations filelist 'packages.list'
for file in "${filelist[@]}"; do
echo "Configuration: ${file}"
done
result="$(echo $(printf "'%s' " "${filelist[@]}"))"
debian: honor verbose; fixed bug where base package.list was not being used
2014-11-04 04:59:48 +00:00
assertTest "echo ${result}" "tests/template-flavors/another_location/whonix gw/packages.list tests/template-flavors/wheezy+whonix-gateway+gnome/packages.list tests/template-flavors/packages.list"
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
assertEnd
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
# ------------------------------------------------------------------------------
Updated tests to include tests for new features added to functions*.sh
2015-03-15 19:04:23 +00:00
# 18. Configuration Files - No Template
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
# ------------------------------------------------------------------------------
Added ability to name tempaltes within configuration file and check/fix to make sure names under 32 characters
2014-10-24 20:17:29 +00:00
SCRIPTSDIR="tests/template-flavors"
DIST="wheezy"
DISTS_VM=""
TEMPLATE_FLAVOR=""
TEMPLATE_FLAVOR_PREFIX=""
TEMPLATE_FLAVOR_DIR=""
TEMPLATE_OPTIONS=('gnome')
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
header <<EOF
Updated tests to include tests for new features added to functions*.sh
2015-03-15 19:04:23 +00:00
18. Configuration Files - No Template
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
Find packages.list for every template available
EOF
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
getFileLocations filelist 'packages.list'
for file in "${filelist[@]}"; do
echo "Configuration: ${file}"
done
result="$(echo $(printf "'%s' " "${filelist[@]}"))"
assertTest "echo ${result}" "tests/template-flavors/packages.list"
assertEnd
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
# ------------------------------------------------------------------------------
Updated tests to include tests for new features added to functions*.sh
2015-03-15 19:04:23 +00:00
# 19. Configuration Files - No Template - with suffix
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
# ------------------------------------------------------------------------------
Added ability to name tempaltes within configuration file and check/fix to make sure names under 32 characters
2014-10-24 20:17:29 +00:00
SCRIPTSDIR="tests/template-flavors"
DIST="wheezy"
DISTS_VM=""
TEMPLATE_FLAVOR=""
TEMPLATE_FLAVOR_PREFIX=""
TEMPLATE_FLAVOR_DIR=""
TEMPLATE_OPTIONS=('gnome')
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
header <<EOF
Updated tests to include tests for new features added to functions*.sh
2015-03-15 19:04:23 +00:00
19. Configuration Files - No Template - with suffix
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
Find packages.list for every template available
EOF
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
getFileLocations filelist 'packages.list' 'wheezy'
for file in "${filelist[@]}"; do
echo "Configuration: ${file}"
done
result="$(echo $(printf "'%s' " "${filelist[@]}"))"
assertTest "echo ${result}" "tests/template-flavors/packages_wheezy.list"
assertEnd
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
# ------------------------------------------------------------------------------
Updated tests to include tests for new features added to functions*.sh
2015-03-15 19:04:23 +00:00
# 20. Copy files
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
# ------------------------------------------------------------------------------
Added ability to name tempaltes within configuration file and check/fix to make sure names under 32 characters
2014-10-24 20:17:29 +00:00
SCRIPTSDIR="tests/template-flavors"
DIST="wheezy"
DISTS_VM=""
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
TEMPLATE_FLAVOR="whonix-gateway"
Added ability to name tempaltes within configuration file and check/fix to make sure names under 32 characters
2014-10-24 20:17:29 +00:00
TEMPLATE_FLAVOR_PREFIX=""
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
TEMPLATE_FLAVOR_DIR=""
TEMPLATE_OPTIONS=""
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
INSTALLDIR="${SCRIPTSDIR}/test_copy_location"
header <<EOF
Updated tests to include tests for new features added to functions*.sh
2015-03-15 19:04:23 +00:00
20. Copy files
Moved qubes-extra-files to its own directory as a sub-template (proxy) as its only needed for proxies Removed call from qubes_installation scripts for proxy files. will now be added by sub-template Renamed extra-whonix-files to files Modifies functions.sh to allow for very short proxy names and custom directories that will be dist independent
2014-10-24 10:48:11 +00:00
Just test copying from here to ${INSTALLDIR}
INSTALLDIR="${SCRIPTSDIR}/test_copy_location"
EOF
Code cleanup - whonix* not tested
2014-10-28 08:09:55 +00:00
rm -f "${INSTALLDIR}"/test1
rm -f "${INSTALLDIR}"/test2
rm -f "${INSTALLDIR}"/test3
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
copyTree "files"
Code cleanup - whonix* not tested
2014-10-28 08:09:55 +00:00
ls -l "${INSTALLDIR}"
assertTest "ls ${INSTALLDIR}" "test1\ntest2\ntest3"
Created function to load package.list from proper directories. There can be multiple targets if TEMPLATE_FLAVOR and sub flavors are defined. All package.list files are kept within each flavor directory Refactored some code to allow above to reduce duplication of code
2014-10-22 20:37:26 +00:00
assertEnd
Added ability to be able to relocate TEMPLATE_FLAVORS to any directory via configuration file Added ability to specify more than one TEMPLATE_FLAVOR (Primary plus others) Added ability for all TEMPLATE_FLAVORS and others to be able to hook into scripts (pre / post) Addeed tests for above functionality With these changes TEMPLATE_FLAVORS can be self contained and not polute code space
2014-10-21 13:12:05 +00:00
# Done
popd
Reference in New Issue Copy Permalink