From f597ff760f147db99947f4cbc565acfd080d1bb2 Mon Sep 17 00:00:00 2001 From: Jason Mehring Date: Tue, 21 Oct 2014 09:12:05 -0400 Subject: [PATCH] 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 --- functions.sh | 173 +++-- .../00_prepare_pre.sh | 1 - .../01_install_core_post.sh | 1 - .../02_install_groups_packages_installed.sh | 1 - .../04_install_qubes_post.sh | 1 - .../00_prepare_pre.sh | 1 - .../01_install_core_post.sh | 1 - .../02_install_groups_packages_installed.sh | 1 - .../04_install_qubes_post.sh | 1 - .../wheezy+whonix-gateway/00_prepare_pre.sh | 1 + .../01_install_core_post.sh | 1 + .../02_install_groups_packages_installed.sh | 1 + .../04_install_qubes_post.sh | 1 + .../99_custom_configuration.sh | 0 .../extra-whonix-files/.facl | 0 .../etc/udev/rules.d/99-qubes-whonix.rules | 0 .../usr/lib/whonix/replace-ips | 0 .../usr/lib/whonix/setup-ip | 0 .../00_prepare_pre.sh | 1 + .../01_install_core_post.sh | 1 + .../02_install_groups_packages_installed.sh | 1 + .../04_install_qubes_post.sh | 1 + .../99_custom_configuration.sh | 0 .../00_prepare_pre.sh | 0 .../01_install_core_post.sh | 0 .../02_install_groups_packages_installed.sh | 0 .../04_install_qubes_post.sh | 0 tests/assert/.travis.yml | 4 + tests/assert/COPYING | 674 ++++++++++++++++++ tests/assert/COPYING.LESSER | 165 +++++ tests/assert/README.rst | 176 +++++ tests/assert/assert.sh | 148 ++++ tests/assert/tests.sh | 121 ++++ .../TODO => tests/template-flavors/NOTES | 14 +- .../wheezy+whonix-gateway+gnome/test_pre.sh | 4 + .../wheezy+whonix-gateway/test_pre.sh | 4 + .../debian+whonix-gateway+gnome/test_pre.sh | 4 + .../debian+whonix-gateway/test_pre.sh | 4 + tests/template-flavors/test.sh | 162 +++++ .../template-flavors/test_copy_location/test1 | 0 .../template-flavors/test_copy_location/test2 | 0 .../template-flavors/test_copy_location/test3 | 0 tests/template-flavors/test_pre.sh | 4 + .../wheezy+whonix-gateway+gnome/test_pre.sh | 4 + .../wheezy+whonix-gateway/files/test1 | 0 .../wheezy+whonix-gateway/files/test2 | 0 .../wheezy+whonix-gateway/files/test3 | 0 .../wheezy+whonix-gateway/test_pre.sh | 4 + tests/template-flavors/wheezy/test_pre.sh | 4 + .../whonix-gateway+gnome/test_pre.sh | 4 + .../whonix-gateway/test_pre.sh | 4 + 51 files changed, 1635 insertions(+), 58 deletions(-) delete mode 120000 scripts_debian/custom_wheezy_whonix-gateway/00_prepare_pre.sh delete mode 120000 scripts_debian/custom_wheezy_whonix-gateway/01_install_core_post.sh delete mode 120000 scripts_debian/custom_wheezy_whonix-gateway/02_install_groups_packages_installed.sh delete mode 120000 scripts_debian/custom_wheezy_whonix-gateway/04_install_qubes_post.sh delete mode 120000 scripts_debian/custom_wheezy_whonix-workstation/00_prepare_pre.sh delete mode 120000 scripts_debian/custom_wheezy_whonix-workstation/01_install_core_post.sh delete mode 120000 scripts_debian/custom_wheezy_whonix-workstation/02_install_groups_packages_installed.sh delete mode 120000 scripts_debian/custom_wheezy_whonix-workstation/04_install_qubes_post.sh create mode 120000 scripts_debian/wheezy+whonix-gateway/00_prepare_pre.sh create mode 120000 scripts_debian/wheezy+whonix-gateway/01_install_core_post.sh create mode 120000 scripts_debian/wheezy+whonix-gateway/02_install_groups_packages_installed.sh create mode 120000 scripts_debian/wheezy+whonix-gateway/04_install_qubes_post.sh rename scripts_debian/{custom_wheezy_whonix-gateway => wheezy+whonix-gateway}/99_custom_configuration.sh (100%) rename scripts_debian/{custom_wheezy_whonix-gateway => wheezy+whonix-gateway}/extra-whonix-files/.facl (100%) rename scripts_debian/{custom_wheezy_whonix-gateway => wheezy+whonix-gateway}/extra-whonix-files/etc/udev/rules.d/99-qubes-whonix.rules (100%) rename scripts_debian/{custom_wheezy_whonix-gateway => wheezy+whonix-gateway}/extra-whonix-files/usr/lib/whonix/replace-ips (100%) rename scripts_debian/{custom_wheezy_whonix-gateway => wheezy+whonix-gateway}/extra-whonix-files/usr/lib/whonix/setup-ip (100%) create mode 120000 scripts_debian/wheezy+whonix-workstation/00_prepare_pre.sh create mode 120000 scripts_debian/wheezy+whonix-workstation/01_install_core_post.sh create mode 120000 scripts_debian/wheezy+whonix-workstation/02_install_groups_packages_installed.sh create mode 120000 scripts_debian/wheezy+whonix-workstation/04_install_qubes_post.sh rename scripts_debian/{custom_wheezy_whonix-workstation => wheezy+whonix-workstation}/99_custom_configuration.sh (100%) rename scripts_debian/{custom_wheezy_whonix => wheezy+whonix}/00_prepare_pre.sh (100%) rename scripts_debian/{custom_wheezy_whonix => wheezy+whonix}/01_install_core_post.sh (100%) rename scripts_debian/{custom_wheezy_whonix => wheezy+whonix}/02_install_groups_packages_installed.sh (100%) rename scripts_debian/{custom_wheezy_whonix => wheezy+whonix}/04_install_qubes_post.sh (100%) create mode 100644 tests/assert/.travis.yml create mode 100644 tests/assert/COPYING create mode 100644 tests/assert/COPYING.LESSER create mode 100644 tests/assert/README.rst create mode 100644 tests/assert/assert.sh create mode 100755 tests/assert/tests.sh rename scripts_debian/TODO => tests/template-flavors/NOTES (76%) create mode 100755 tests/template-flavors/another_location/wheezy+whonix-gateway+gnome/test_pre.sh create mode 100755 tests/template-flavors/another_location/wheezy+whonix-gateway/test_pre.sh create mode 100755 tests/template-flavors/debian+whonix-gateway+gnome/test_pre.sh create mode 100755 tests/template-flavors/debian+whonix-gateway/test_pre.sh create mode 100755 tests/template-flavors/test.sh create mode 100644 tests/template-flavors/test_copy_location/test1 create mode 100644 tests/template-flavors/test_copy_location/test2 create mode 100644 tests/template-flavors/test_copy_location/test3 create mode 100755 tests/template-flavors/test_pre.sh create mode 100755 tests/template-flavors/wheezy+whonix-gateway+gnome/test_pre.sh create mode 100644 tests/template-flavors/wheezy+whonix-gateway/files/test1 create mode 100644 tests/template-flavors/wheezy+whonix-gateway/files/test2 create mode 100644 tests/template-flavors/wheezy+whonix-gateway/files/test3 create mode 100755 tests/template-flavors/wheezy+whonix-gateway/test_pre.sh create mode 100755 tests/template-flavors/wheezy/test_pre.sh create mode 100755 tests/template-flavors/whonix-gateway+gnome/test_pre.sh create mode 100755 tests/template-flavors/whonix-gateway/test_pre.sh diff --git a/functions.sh b/functions.sh index 955f482..8124ac6 100755 --- a/functions.sh +++ b/functions.sh @@ -73,22 +73,21 @@ fi # Display messages in color # ------------------------------------------------------------------------------ info() { - echo "${bold}${blue}INFO: ${1}${reset}" + [[ -z $TEST ]] && echo -e "${bold}${blue}INFO: ${1}${reset}" || : } debug() { - echo "${bold}${green}DEBUG: ${1}${reset}" + [[ -z $TEST ]] && echo -e "${bold}${green}DEBUG: ${1}${reset}" || : } warn() { - echo "${stout}${yellow}WARNING: ${1}${reset}" + [[ -z $TEST ]] && echo -e "${stout}${yellow}WARNING: ${1}${reset}" || : } error() { - echo "${bold}${red}ERROR: ${1}${reset}" + [[ -z $TEST ]] && echo -e "${bold}${red}ERROR: ${1}${reset}" || : } - # ------------------------------------------------------------------------------ # Takes an array and exports it a global variable # @@ -141,64 +140,62 @@ splitPath() { setArrayAsGlobal PARTS $return_global_var } - -# ------------------------------------------------------------------------------ -# Executes any additional optional configuration steps if the configuration -# scripts exist -# ------------------------------------------------------------------------------ -customStep() { - info "Checking for any custom $2 configuration scripts for $1..." - splitPath "$1" path_parts - if [ "$2" ]; then - script_name="${path_parts[base]}_$2${path_parts[dotext]}" +customStepExec() { + local calling_script="$1" + local step="$2" + local template_flavor="$3" + local template_flavor_dir="$4" + local template_flavor_prefix="$5" + + [[ -z $TEST ]] && echo "Calling script: ${calling_script}" || : + [[ -z $TEST ]] && echo "Step: ${step}" || : + [[ -z $TEST ]] && echo "Template Flavor: ${template_flavor}" || : + [[ -z $TEST ]] && echo "Template Dir: ${template_flavor_dir}" || : + [[ -z $TEST ]] && echo "Template Prefix: ${template_flavor_prefix}" || : + + splitPath "${calling_script}" path_parts + + # Step: [pre] | [post] (or custom inserted step) + if [ "${step}" ]; then + script_name="${path_parts[base]}_${step}${path_parts[dotext]}" else script_name="${path_parts[base]}${path_parts[dotext]}" fi - if [ -n "${TEMPLATE_FLAVOR}" ]; then - script="$SCRIPTSDIR/custom_${DIST}_${TEMPLATE_FLAVOR}/${script_name}" + if [ -n "${template_flavor}" ]; then + script="${template_flavor_dir}/${template_flavor_prefix}${template_flavor}/${script_name}" else - script="$SCRIPTSDIR/custom_${DIST}/${script_name}" + script="${template_flavor_dir}/${template_flavor_prefix}/${script_name}" fi if [ -f "$script" ]; then - echo "${bold}${under}INFO: Currently running script: ${script}${reset}" + [[ -n $TEST ]] && echo "${script}" || echo "${bold}${under}INFO: Currently running script: ${script}${reset}" "$script" + else + [[ -z $TEST ]] && debug "${bold}INFO: No CustomStep found for: ${script}${reset}" || : fi } - -# ------------------------------------------------------------------------------ -# Copy extra file tree to $INSTALLDIR -# -# To set file permissions is a PITA since git won't save them and will -# complain heavily if they are set to root only read, so this is the procdure: -# -# 1. Change to the directory that you want to have file permissions retained -# 2. Change all the file permissions / ownership as you want -# 3. Change back to the root of the exta directory (IE: extra-qubes-files) -# 4. getfacl -R . > ".facl" -# 5. If git complains; reset file ownership back to user. The .facl file stored -# the file permissions and will be used to reset the file permissions after -# they get copied over to $INSTALLDIR -# NOTE: Don't forget to redo this process if you add -OR- remove files -# ------------------------------------------------------------------------------ -copy_dirs() { - dir="$1" - install_dir="$(readlink -m ${INSTALLDIR})" +customCopy() { + local calling_script="$1" + local dir="$2" + local template_flavor="$3" + local template_flavor_dir="$4" + local template_flavor_prefix="$5" + local install_dir="$(readlink -m ${INSTALLDIR})" info "copy_dirs(): ${install_dir}" - if [ -n "${TEMPLATE_FLAVOR}" ]; then - custom_dir="${SCRIPTSDIR}/custom_${DIST}_${TEMPLATE_FLAVOR}/${dir}" + if [ -n "${template_flavor}" ]; then + custom_dir="${template_flavor_dir}/${template_flavor_prefix}${template_flavor}/${dir}" else - custom_dir="${SCRIPTSDIR}/custom_${DIST}/${dir}" + custom_dir="${template_flavor_dir}/${template_flavor_prefix}/${dir}" fi if [ -d "${custom_dir}" ]; then dir="${custom_dir}/" - elif [ -d "${SCRIPTSDIR}/${dir}" ]; then - dir="${SCRIPTSDIR}/${dir}/" + elif [ -d "${template_flavor_dir}/${dir}" ]; then + dir="${template_flavor_dir}/${dir}/" else debug "No extra files to copy for ${dir}" return 0 @@ -218,5 +215,95 @@ copy_dirs() { fi } +templateFlavor() { + local template=${TEMPLATE_FLAVOR} + local default="${SCRIPTSDIR}" + + echo ${template:-${default}} +} + +templateFlavorPrefix() { + local template=${1-${TEMPLATE_FLAVOR}} + for element in "${TEMPLATE_FLAVOR_PREFIX[@]}" + do + if [ "${element%;*}" == "${DIST}+${template}" ]; then + echo ${element#*;} + return + fi + done + + echo "${DIST}${TEMPLATE_FLAVOR:++}" +} + +templateFlavorDir() { + local template=${1-${TEMPLATE_FLAVOR}} + for element in "${TEMPLATE_FLAVOR_DIR[@]}" + do + if [ "${element%;*}" == "${DIST}+${template}" ]; then + echo ${element#*;} + return + fi + done + + echo "${SCRIPTDIR}" +} + +customParse() { + local calling_script="$1" + local step="$2" + local functionExec="$3" + local template_flavor="$(templateFlavor)" + local template_flavor_dir="$(templateFlavorDir ${template_flavor})" + local template_flavor_prefix="$(templateFlavorPrefix ${template_flavor})" + + ${functionExec} "${calling_script}" \ + "${step}" \ + "${template_flavor}" \ + "${template_flavor_dir}" \ + "${template_flavor_prefix}" + + + for template in ${TEMPLATE_OPTIONS[@]} + do + template_flavor="$(templateFlavor)+${template}" + template_flavor_dir="$(templateFlavorDir ${template_flavor})" + template_flavor_prefix="$(templateFlavorPrefix ${template_flavor})" + + ${functionExec} "${calling_script}" \ + "${step}" \ + "${template_flavor}" \ + "${template_flavor_dir}" \ + "${template_flavor_prefix}" + done +} + +# ------------------------------------------------------------------------------ +# Executes any additional optional configuration steps if the configuration +# scripts exist +# ------------------------------------------------------------------------------ +customStep() { + customParse "$1" "$2" "customStepExec" +} + +# ------------------------------------------------------------------------------ +# Copy extra file tree to $INSTALLDIR +# TODO: Allow copy per step (04_install_qubes.sh-files) +# +# To set file permissions is a PITA since git won't save them and will +# complain heavily if they are set to root only read, so this is the procdure: +# +# 1. Change to the directory that you want to have file permissions retained +# 2. Change all the file permissions / ownership as you want +# 3. Change back to the root of the exta directory (IE: extra-qubes-files) +# 4. getfacl -R . > ".facl" +# 5. If git complains; reset file ownership back to user. The .facl file stored +# the file permissions and will be used to reset the file permissions after +# they get copied over to $INSTALLDIR +# NOTE: Don't forget to redo this process if you add -OR- remove files +# ------------------------------------------------------------------------------ +copy_dirs() { + customParse "" "$1" "customCopy" +} + # $0 is module that sourced vars.sh echo "${bold}${under}INFO: Currently running script: ${0}${reset}" diff --git a/scripts_debian/custom_wheezy_whonix-gateway/00_prepare_pre.sh b/scripts_debian/custom_wheezy_whonix-gateway/00_prepare_pre.sh deleted file mode 120000 index 9ad8e72..0000000 --- a/scripts_debian/custom_wheezy_whonix-gateway/00_prepare_pre.sh +++ /dev/null @@ -1 +0,0 @@ -../custom_wheezy_whonix/00_prepare_pre.sh \ No newline at end of file diff --git a/scripts_debian/custom_wheezy_whonix-gateway/01_install_core_post.sh b/scripts_debian/custom_wheezy_whonix-gateway/01_install_core_post.sh deleted file mode 120000 index ba75217..0000000 --- a/scripts_debian/custom_wheezy_whonix-gateway/01_install_core_post.sh +++ /dev/null @@ -1 +0,0 @@ -../custom_wheezy_whonix/01_install_core_post.sh \ No newline at end of file diff --git a/scripts_debian/custom_wheezy_whonix-gateway/02_install_groups_packages_installed.sh b/scripts_debian/custom_wheezy_whonix-gateway/02_install_groups_packages_installed.sh deleted file mode 120000 index 282b083..0000000 --- a/scripts_debian/custom_wheezy_whonix-gateway/02_install_groups_packages_installed.sh +++ /dev/null @@ -1 +0,0 @@ -../custom_wheezy_whonix/02_install_groups_packages_installed.sh \ No newline at end of file diff --git a/scripts_debian/custom_wheezy_whonix-gateway/04_install_qubes_post.sh b/scripts_debian/custom_wheezy_whonix-gateway/04_install_qubes_post.sh deleted file mode 120000 index 2ee5337..0000000 --- a/scripts_debian/custom_wheezy_whonix-gateway/04_install_qubes_post.sh +++ /dev/null @@ -1 +0,0 @@ -../custom_wheezy_whonix/04_install_qubes_post.sh \ No newline at end of file diff --git a/scripts_debian/custom_wheezy_whonix-workstation/00_prepare_pre.sh b/scripts_debian/custom_wheezy_whonix-workstation/00_prepare_pre.sh deleted file mode 120000 index 9ad8e72..0000000 --- a/scripts_debian/custom_wheezy_whonix-workstation/00_prepare_pre.sh +++ /dev/null @@ -1 +0,0 @@ -../custom_wheezy_whonix/00_prepare_pre.sh \ No newline at end of file diff --git a/scripts_debian/custom_wheezy_whonix-workstation/01_install_core_post.sh b/scripts_debian/custom_wheezy_whonix-workstation/01_install_core_post.sh deleted file mode 120000 index ba75217..0000000 --- a/scripts_debian/custom_wheezy_whonix-workstation/01_install_core_post.sh +++ /dev/null @@ -1 +0,0 @@ -../custom_wheezy_whonix/01_install_core_post.sh \ No newline at end of file diff --git a/scripts_debian/custom_wheezy_whonix-workstation/02_install_groups_packages_installed.sh b/scripts_debian/custom_wheezy_whonix-workstation/02_install_groups_packages_installed.sh deleted file mode 120000 index 282b083..0000000 --- a/scripts_debian/custom_wheezy_whonix-workstation/02_install_groups_packages_installed.sh +++ /dev/null @@ -1 +0,0 @@ -../custom_wheezy_whonix/02_install_groups_packages_installed.sh \ No newline at end of file diff --git a/scripts_debian/custom_wheezy_whonix-workstation/04_install_qubes_post.sh b/scripts_debian/custom_wheezy_whonix-workstation/04_install_qubes_post.sh deleted file mode 120000 index 2ee5337..0000000 --- a/scripts_debian/custom_wheezy_whonix-workstation/04_install_qubes_post.sh +++ /dev/null @@ -1 +0,0 @@ -../custom_wheezy_whonix/04_install_qubes_post.sh \ No newline at end of file diff --git a/scripts_debian/wheezy+whonix-gateway/00_prepare_pre.sh b/scripts_debian/wheezy+whonix-gateway/00_prepare_pre.sh new file mode 120000 index 0000000..d1f0dd6 --- /dev/null +++ b/scripts_debian/wheezy+whonix-gateway/00_prepare_pre.sh @@ -0,0 +1 @@ +../wheezy+whonix/00_prepare_pre.sh \ No newline at end of file diff --git a/scripts_debian/wheezy+whonix-gateway/01_install_core_post.sh b/scripts_debian/wheezy+whonix-gateway/01_install_core_post.sh new file mode 120000 index 0000000..3524b69 --- /dev/null +++ b/scripts_debian/wheezy+whonix-gateway/01_install_core_post.sh @@ -0,0 +1 @@ +../wheezy+whonix/01_install_core_post.sh \ No newline at end of file diff --git a/scripts_debian/wheezy+whonix-gateway/02_install_groups_packages_installed.sh b/scripts_debian/wheezy+whonix-gateway/02_install_groups_packages_installed.sh new file mode 120000 index 0000000..4b74627 --- /dev/null +++ b/scripts_debian/wheezy+whonix-gateway/02_install_groups_packages_installed.sh @@ -0,0 +1 @@ +../wheezy+whonix/02_install_groups_packages_installed.sh \ No newline at end of file diff --git a/scripts_debian/wheezy+whonix-gateway/04_install_qubes_post.sh b/scripts_debian/wheezy+whonix-gateway/04_install_qubes_post.sh new file mode 120000 index 0000000..db7d12f --- /dev/null +++ b/scripts_debian/wheezy+whonix-gateway/04_install_qubes_post.sh @@ -0,0 +1 @@ +../wheezy+whonix/04_install_qubes_post.sh \ No newline at end of file diff --git a/scripts_debian/custom_wheezy_whonix-gateway/99_custom_configuration.sh b/scripts_debian/wheezy+whonix-gateway/99_custom_configuration.sh similarity index 100% rename from scripts_debian/custom_wheezy_whonix-gateway/99_custom_configuration.sh rename to scripts_debian/wheezy+whonix-gateway/99_custom_configuration.sh diff --git a/scripts_debian/custom_wheezy_whonix-gateway/extra-whonix-files/.facl b/scripts_debian/wheezy+whonix-gateway/extra-whonix-files/.facl similarity index 100% rename from scripts_debian/custom_wheezy_whonix-gateway/extra-whonix-files/.facl rename to scripts_debian/wheezy+whonix-gateway/extra-whonix-files/.facl diff --git a/scripts_debian/custom_wheezy_whonix-gateway/extra-whonix-files/etc/udev/rules.d/99-qubes-whonix.rules b/scripts_debian/wheezy+whonix-gateway/extra-whonix-files/etc/udev/rules.d/99-qubes-whonix.rules similarity index 100% rename from scripts_debian/custom_wheezy_whonix-gateway/extra-whonix-files/etc/udev/rules.d/99-qubes-whonix.rules rename to scripts_debian/wheezy+whonix-gateway/extra-whonix-files/etc/udev/rules.d/99-qubes-whonix.rules diff --git a/scripts_debian/custom_wheezy_whonix-gateway/extra-whonix-files/usr/lib/whonix/replace-ips b/scripts_debian/wheezy+whonix-gateway/extra-whonix-files/usr/lib/whonix/replace-ips similarity index 100% rename from scripts_debian/custom_wheezy_whonix-gateway/extra-whonix-files/usr/lib/whonix/replace-ips rename to scripts_debian/wheezy+whonix-gateway/extra-whonix-files/usr/lib/whonix/replace-ips diff --git a/scripts_debian/custom_wheezy_whonix-gateway/extra-whonix-files/usr/lib/whonix/setup-ip b/scripts_debian/wheezy+whonix-gateway/extra-whonix-files/usr/lib/whonix/setup-ip similarity index 100% rename from scripts_debian/custom_wheezy_whonix-gateway/extra-whonix-files/usr/lib/whonix/setup-ip rename to scripts_debian/wheezy+whonix-gateway/extra-whonix-files/usr/lib/whonix/setup-ip diff --git a/scripts_debian/wheezy+whonix-workstation/00_prepare_pre.sh b/scripts_debian/wheezy+whonix-workstation/00_prepare_pre.sh new file mode 120000 index 0000000..d1f0dd6 --- /dev/null +++ b/scripts_debian/wheezy+whonix-workstation/00_prepare_pre.sh @@ -0,0 +1 @@ +../wheezy+whonix/00_prepare_pre.sh \ No newline at end of file diff --git a/scripts_debian/wheezy+whonix-workstation/01_install_core_post.sh b/scripts_debian/wheezy+whonix-workstation/01_install_core_post.sh new file mode 120000 index 0000000..3524b69 --- /dev/null +++ b/scripts_debian/wheezy+whonix-workstation/01_install_core_post.sh @@ -0,0 +1 @@ +../wheezy+whonix/01_install_core_post.sh \ No newline at end of file diff --git a/scripts_debian/wheezy+whonix-workstation/02_install_groups_packages_installed.sh b/scripts_debian/wheezy+whonix-workstation/02_install_groups_packages_installed.sh new file mode 120000 index 0000000..4b74627 --- /dev/null +++ b/scripts_debian/wheezy+whonix-workstation/02_install_groups_packages_installed.sh @@ -0,0 +1 @@ +../wheezy+whonix/02_install_groups_packages_installed.sh \ No newline at end of file diff --git a/scripts_debian/wheezy+whonix-workstation/04_install_qubes_post.sh b/scripts_debian/wheezy+whonix-workstation/04_install_qubes_post.sh new file mode 120000 index 0000000..db7d12f --- /dev/null +++ b/scripts_debian/wheezy+whonix-workstation/04_install_qubes_post.sh @@ -0,0 +1 @@ +../wheezy+whonix/04_install_qubes_post.sh \ No newline at end of file diff --git a/scripts_debian/custom_wheezy_whonix-workstation/99_custom_configuration.sh b/scripts_debian/wheezy+whonix-workstation/99_custom_configuration.sh similarity index 100% rename from scripts_debian/custom_wheezy_whonix-workstation/99_custom_configuration.sh rename to scripts_debian/wheezy+whonix-workstation/99_custom_configuration.sh diff --git a/scripts_debian/custom_wheezy_whonix/00_prepare_pre.sh b/scripts_debian/wheezy+whonix/00_prepare_pre.sh similarity index 100% rename from scripts_debian/custom_wheezy_whonix/00_prepare_pre.sh rename to scripts_debian/wheezy+whonix/00_prepare_pre.sh diff --git a/scripts_debian/custom_wheezy_whonix/01_install_core_post.sh b/scripts_debian/wheezy+whonix/01_install_core_post.sh similarity index 100% rename from scripts_debian/custom_wheezy_whonix/01_install_core_post.sh rename to scripts_debian/wheezy+whonix/01_install_core_post.sh diff --git a/scripts_debian/custom_wheezy_whonix/02_install_groups_packages_installed.sh b/scripts_debian/wheezy+whonix/02_install_groups_packages_installed.sh similarity index 100% rename from scripts_debian/custom_wheezy_whonix/02_install_groups_packages_installed.sh rename to scripts_debian/wheezy+whonix/02_install_groups_packages_installed.sh diff --git a/scripts_debian/custom_wheezy_whonix/04_install_qubes_post.sh b/scripts_debian/wheezy+whonix/04_install_qubes_post.sh similarity index 100% rename from scripts_debian/custom_wheezy_whonix/04_install_qubes_post.sh rename to scripts_debian/wheezy+whonix/04_install_qubes_post.sh diff --git a/tests/assert/.travis.yml b/tests/assert/.travis.yml new file mode 100644 index 0000000..4cb26a2 --- /dev/null +++ b/tests/assert/.travis.yml @@ -0,0 +1,4 @@ +language: bash +script: bash tests.sh +before_install: + - sudo apt-get install bc diff --git a/tests/assert/COPYING b/tests/assert/COPYING new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/tests/assert/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/tests/assert/COPYING.LESSER b/tests/assert/COPYING.LESSER new file mode 100644 index 0000000..cca7fc2 --- /dev/null +++ b/tests/assert/COPYING.LESSER @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/tests/assert/README.rst b/tests/assert/README.rst new file mode 100644 index 0000000..f2630b4 --- /dev/null +++ b/tests/assert/README.rst @@ -0,0 +1,176 @@ +########### + assert.sh +########### + +**assert.sh** is test-driven development in the Bourne again shell. + +:Version: 1.0.2 +:Author: Robert Lehmann +:License: LGPLv3 +:Requirements: `bc -- an arbitrary precision calculator language + `_ + (installed on all POSIX-compliant systems) + +.. image:: https://travis-ci.org/lehmannro/assert.sh.svg?branch=master + :target: https://travis-ci.org/lehmannro/assert.sh + +Example +======= + +:: + + . assert.sh + + # `echo test` is expected to write "test" on stdout + assert "echo test" "test" + # `seq 3` is expected to print "1", "2" and "3" on different lines + assert "seq 3" "1\n2\n3" + # exit code of `true` is expected to be 0 + assert_raises "true" + # exit code of `false` is expected to be 1 + assert_raises "false" 1 + # end of test suite + assert_end examples + +If you had written the above snippet into ``tests.sh`` you could invoke it +without any extra hassle:: + + $ ./tests.sh + all 4 examples tests passed in 0.014s. + +Watch out to have ``tests.sh`` executable (``chmod +x tests.sh``), otherwise +you need to invoke it with ``bash tests.sh`` + +Now, we will add a failing test case to our suite:: + + # expect `exit 127` to terminate with code 128 + assert_raises "exit 127" 128 + +Remember to insert test cases before ``assert_end`` (or write another +``assert_end`` to the end of your file). Otherwise test statistics will be +omitted. + +When run, the output is:: + + test #5 "exit 127" failed: + program terminated with code 127 instead of 128 + 1 of 5 examples tests failed in 0.019s. + + +Features +======== + ++ lightweight interface: ``assert`` and ``assert_raises`` *only* ++ minimal setup -- source ``assert.sh`` and you're done ++ test grouping in individual suites ++ time benchmarks with real-time display of test progress ++ run all tests, stop on first failure, or collect numbers only + +Use case +======== + +You wrote an application. Following sane development practices, you want to +protect yourself against introducing errors with a test suite. Even though most +languages have excellent testing tools, modifying process state (input ``stdin``, +command line arguments ``argv``, environment variables) is awkard in most +languages. The shell was made to do just that, so why don't run the tests in +your shell? + +Reference +========= + ++ ``assert [stdout] [stdin]`` + + Check for an expected output when running your command. `stdout` supports all + control sequences printf(1) interprets, eg. ``\n`` for a newline. The default + `stdout` is assumed to be empty. + ++ ``assert_raises [exitcode] [stdin]`` + + Verify `command` terminated with the expected status code. The default + `exitcode` is assumed to be 0. + ++ ``assert_end [suite]`` + + Finalize a test suite and print statistics. + +Command line options +-------------------- + +See ``assert.sh --help`` for command line options on test runners. + + -v, --verbose Generate real-time output for every individual test run. + -x, --stop Stop running tests after the first failure. + (Default: run all tests.) + -i, --invariant Do not measure runtime for suites. Useful mainly to parse + test output. + -d, --discover Collect test suites and number of tests only; don't run any + tests. + -c, --continue Do not modify exit code depending on overall suite status. + -h Show brief usage information and exit. + --help Show usage manual and exit. + +Environment variables +--------------------- + +================= ==================== +variable corresponding option +================= ==================== +``$DEBUG`` ``--verbose`` +``$STOP`` ``--stop`` +``$INVARIANT`` ``--invariant`` +``$DISCOVERONLY`` ``--discover-only`` +``$CONTINUE`` ``--continue`` +================= ==================== + +Changelog +========= + +master + * Added support for ``set -e`` environments (closes `#6 + `_, thanks David Schoen.) + * Modified exit code automatically in case *any* test failed in the suite. + * Added ``--continue`` flag to avoid tinkering with the exit code. + +1.0.2 + * Fixed Mac OS compatibility (closes `#3 + `_.) + +1.0.1 + * Added support for ``set -u`` environments (closes `#1 + `_.) + * Fixed several leaks of stderr. + * Fixed propagation of options to nested test suites. + +Related projects +================ + +`ShUnit`__ + ShUnit is a testing framework of the xUnit family for Bourne derived shells. + It is quite feature-rich but requires a whole lot of boilerplate to write a + basic test suite. *assert.sh* aims to be lightweight and easy to setup. + +__ http://shunit.sourceforge.net/ + +`shUnit2`__ + shUnit2 is a modern xUnit-style testing framework. It comes with a bunch of + magic to remove unneccessary verbosity. It requires extra care when crafting + test cases with many subprocess invocations as you have to fall back to shell + features to fetch results. *assert.sh* wraps this functionality out of the + box. + +__ http://code.google.com/p/shunit2/ + +`tap-functions`__ + A Test Anything Protocol (TAP) producer with an inherently natural-language- + style API. Unfortunately it's only of draft quality and decouples the test + runner from analysis, which does not allow for *assert.sh* features such as + ``--collect-only`` and ``--stop``. + +__ http://testanything.org/wiki/index.php/Tap-functions + +`stub.sh`__ + Helpers to fake binaries and bash builtins. It supports mocking features such + as expecting a certain number of invocations and plays well with *assert.sh*. + +__ https://github.com/jimeh/stub.sh diff --git a/tests/assert/assert.sh b/tests/assert/assert.sh new file mode 100644 index 0000000..b0c679c --- /dev/null +++ b/tests/assert/assert.sh @@ -0,0 +1,148 @@ +#!/bin/bash +# assert.sh 1.0 - bash unit testing framework +# Copyright (C) 2009, 2010, 2011, 2012 Robert Lehmann +# +# http://github.com/lehmannro/assert.sh +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published +# by the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . + +export DISCOVERONLY=${DISCOVERONLY:-} +export DEBUG=${DEBUG:-} +export STOP=${STOP:-} +export INVARIANT=${INVARIANT:-} +export CONTINUE=${CONTINUE:-} + +args="$(getopt -n "$0" -l \ + verbose,help,stop,discover,invariant,continue vhxdic $*)" \ +|| exit -1 +for arg in $args; do + case "$arg" in + -h) + echo "$0 [-vxidc]" \ + "[--verbose] [--stop] [--invariant] [--discover] [--continue]" + echo "`sed 's/./ /g' <<< "$0"` [-h] [--help]" + exit 0;; + --help) + cat < [stdin] + (( tests_ran++ )) || : + [[ -n "$DISCOVERONLY" ]] && return || true + # printf required for formatting + printf -v expected "x${2:-}" # x required to overwrite older results + result="$(eval 2>/dev/null $1 <<< ${3:-})" || true + # Note: $expected is already decorated + if [[ "x$result" == "$expected" ]]; then + [[ -n "$DEBUG" ]] && echo -n . || true + return + fi + result="$(sed -e :a -e '$!N;s/\n/\\n/;ta' <<< "$result")" + [[ -z "$result" ]] && result="nothing" || result="\"$result\"" + [[ -z "$2" ]] && expected="nothing" || expected="\"$2\"" + _assert_fail "expected $expected${_indent}got $result" "$1" "$3" +} + +assert_raises() { + # assert_raises [stdin] + (( tests_ran++ )) || : + [[ -n "$DISCOVERONLY" ]] && return || true + status=0 + (eval $1 <<< ${3:-}) > /dev/null 2>&1 || status=$? + expected=${2:-0} + if [[ "$status" -eq "$expected" ]]; then + [[ -n "$DEBUG" ]] && echo -n . || true + return + fi + _assert_fail "program terminated with code $status instead of $expected" "$1" "$3" +} + +_assert_fail() { + # _assert_fail + [[ -n "$DEBUG" ]] && echo -n X + report="test #$tests_ran \"$2${3:+ <<< $3}\" failed:${_indent}$1" + if [[ -n "$STOP" ]]; then + [[ -n "$DEBUG" ]] && echo + echo "$report" + exit 1 + fi + tests_errors[$tests_failed]="$report" + (( tests_failed++ )) || : +} + +_assert_reset +: ${tests_suite_status:=0} # remember if any of the tests failed so far +_assert_cleanup() { + local status=$? + # modify exit code if it's not already non-zero + [[ $status -eq 0 && -z $CONTINUE ]] && exit $tests_suite_status +} +trap _assert_cleanup EXIT diff --git a/tests/assert/tests.sh b/tests/assert/tests.sh new file mode 100755 index 0000000..6a31b6d --- /dev/null +++ b/tests/assert/tests.sh @@ -0,0 +1,121 @@ +#!/bin/bash + +set -e + +. assert.sh + +assert "echo" # no output expected +assert "echo foo" "foo" # output expected +assert "cat" "bar" "bar" # output expected if input's given +assert_raises "true" 0 "" # status code expected +assert_raises "exit 127" 127 "" # status code expected +assert "head -1 < $0" "#!/bin/bash" # redirections +assert "seq 2" "1\n2" # multi-line output expected +assert_raises 'read a; exit $a' 42 "42" # variables still work +assert "echo 1; +echo 2 # ^" "1\n2" # semicolon required! +assert_end demo + +_clean() { + _assert_reset # reset state + DEBUG= STOP= INVARIANT=1 DISCOVERONLY= CONTINUE= # reset flags + eval $* # read new flags +} + +# clean output +assert "_clean; assert true; assert_end" \ +"all 1 tests passed." +# error reports on failure +assert "_clean; assert 'seq 1'; assert_end" \ +'test #1 "seq 1" failed:\n\texpected nothing\n\tgot "1"\n1 of 1 tests failed.' +assert "_clean; assert true '1'; assert_end" \ +'test #1 "true" failed:\n\texpected "1"\n\tgot nothing\n1 of 1 tests failed.' +assert "_clean; assert 'true' 'foo' 'bar'; assert_end" \ +'test #1 "true <<< bar" failed:\n\texpected "foo"\n\tgot nothing\n1 of 1 tests failed.' +# debug output (-v) +assert "_clean DEBUG=1; assert true; assert_end" \ +".\nall 1 tests passed." +assert "_clean DEBUG=1; assert_raises false; assert_end" \ +'X\ntest #1 "false" failed:\n\tprogram terminated with code 1 instead of 0 +1 of 1 tests failed.' +# collect tests only (-d) +assert "_clean DISCOVERONLY=1; assert true; assert false; assert_end" \ +"collected 2 tests." +# stop immediately on failure (-x) +assert "_clean STOP=1; assert_raises false; assert_end" \ +'test #1 "false" failed:\n\tprogram terminated with code 1 instead of 0' +# runtime statistics (omission of -i) +assert_raises "_clean INVARIANT=; +assert_end | egrep 'all 0 tests passed in ([0-9]|[0-9].[0-9]{3})s'" +assert_end output + +# assert_end exit code is the number of failures +assert_raises "_clean; assert_raises false; assert_raises false; assert_end" 2 +# stderr should NOT leak if ignored +assert "_clean; assert less" "" +# stderr should be redirectable though +assert '_clean; assert "less 2>&1" "Missing filename (\"less --help\" for help)"' +# bash failures behave just like stderr +assert "_clean; assert ___invalid" "" +# test suites can be nested and settings are inherited +# (ie. we don't need to invoke the inner suite with the very same options, +# namely --invariant) +assert "_clean; bash -c ' +. assert.sh; +assert_raises true; assert_end outer; +bash -c \". assert.sh; assert_raises true; assert_end inner\" +' '' --invariant" "all 1 outer tests passed. +all 1 inner tests passed." # is $0 +# set the correct exit status +assert_raises "_clean; bash -c \" +. assert.sh; assert true ''; assert_end one; +assert 'echo bar' 'bar'; assert_end two\"" 0 +assert_raises "_clean; bash -c \" +. assert.sh; assert true 'foo'; assert_end one; +assert 'echo bar' 'bar'; assert_end two\"" 1 +# ..but do not override it +assert_raises "_clean; bash -c \" +. assert.sh; assert true 'foo'; assert_end one; +assert 'echo bar' 'bar'; assert_end two; exit 3\"" 3 +# environment variables do not leak +assert "_clean; x=0; assert 'x=1'; assert_raises 'x=2'; echo \$x" 0 +assert "_clean; x=0; assert 'export x=1'; assert_raises 'export x=2'; +echo \$x" 0 +assert_end interaction + +# commit: fixed output to report all errors, not just the first +assert "_clean; +assert_raises false; assert_raises false; +assert_end" 'test #1 "false" failed: +\tprogram terminated with code 1 instead of 0 +test #2 "false" failed: +\tprogram terminated with code 1 instead of 0 +2 of 2 tests failed.' +# commit: added default value for assert_raises +assert_raises "_clean; assert_raises true; assert_end" 0 +# commit: fixed verbose failure reports in assert_raises +assert "_clean DEBUG=1; assert_raises false; assert_end" 'X +test #1 "false" failed: +\tprogram terminated with code 1 instead of 0 +1 of 1 tests failed.' +# commit: redirected assert_raises output +assert "_clean; assert_raises 'echo 1'; assert_end" "all 1 tests passed." +# commit: fixed --discover to reset properly +assert "_clean DISCOVERONLY=1; +assert 1; assert 1; assert_end; +assert 1; assert_end;" "collected 2 tests.\ncollected 1 tests." +# commit: stopped errors from leaking into other test suites +assert "_clean; +assert_raises false; assert_raises false; assert_end; +assert_raises false; assert_end" 'test #1 "false" failed: +\tprogram terminated with code 1 instead of 0 +test #2 "false" failed: +\tprogram terminated with code 1 instead of 0 +2 of 2 tests failed. +test #1 "false" failed: +\tprogram terminated with code 1 instead of 0 +1 of 1 tests failed.' +# issue 1: assert.sh: line 87: DISCOVERONLY: unbound variable +assert "_clean; set -u; assert_raises true; assert true; assert_end" \ +"all 2 tests passed." +assert_end regression diff --git a/scripts_debian/TODO b/tests/template-flavors/NOTES similarity index 76% rename from scripts_debian/TODO rename to tests/template-flavors/NOTES index 17a9484..a599ccb 100644 --- a/scripts_debian/TODO +++ b/tests/template-flavors/NOTES @@ -17,13 +17,13 @@ TODO: # - Would use the prefix of 'debian' which would allow same script to be used for # all 'debian' based builds, or it could have been set as -# 'wheezy+whonix-gateway::' to use a script destined for any distro -TEMPLATE_FLAVOR_PREFIX = wheezy+whonix-gateway::debian \ - wheezy+whonix-workstation::debian +# 'wheezy+whonix-gateway;' to use a script destined for any distro +TEMPLATE_FLAVOR_PREFIX = wheezy+whonix-gateway;debian \ + wheezy+whonix-workstation;debian # Alternate location for template flavor scripts -TEMPLATE_FLAVOR_DIR = wheezy+whonix-gateway::/home/user/whonix/gateway \ - wheezy+whonix-workstation::/home/usr/whonix/workstation +TEMPLATE_FLAVOR_DIR = wheezy+whonix-gateway;/home/user/whonix/gateway \ + wheezy+whonix-workstation;/home/usr/whonix/workstation - allow access to multiple flavor options .. say gnome for whonix-workstation wheezy+whonix-workstation+gnome+more @@ -34,9 +34,9 @@ TEMPLATE_FLAVOR_DIR = wheezy+whonix-gateway::/home/user/whonix/gateway \ # ------------------------------------------------------------------------------ # Would use same FLAVOR for all distros for whonix-workstation+gnome -TEMPLATE_FLAVOR_PREFIX = wheezy+whonix-workstation+gnome:: +TEMPLATE_FLAVOR_PREFIX = wheezy+whonix-workstation+gnome; # - Template Flavors are in /home/user/whoix/gnome for wheezy+whonix-workstation+gnome # - DISTS_VM is still lists all OPTIONAL flavors though -TEMPLATE_FLAVOR_DIR = wheezy+whonix-workstation+gnome::/home/usr/whonix/gnome +TEMPLATE_FLAVOR_DIR = wheezy+whonix-workstation+gnome;/home/usr/whonix/gnome diff --git a/tests/template-flavors/another_location/wheezy+whonix-gateway+gnome/test_pre.sh b/tests/template-flavors/another_location/wheezy+whonix-gateway+gnome/test_pre.sh new file mode 100755 index 0000000..9a4e120 --- /dev/null +++ b/tests/template-flavors/another_location/wheezy+whonix-gateway+gnome/test_pre.sh @@ -0,0 +1,4 @@ +#!/bin/sh +# vim: set ts=4 sw=4 sts=4 et : + +: diff --git a/tests/template-flavors/another_location/wheezy+whonix-gateway/test_pre.sh b/tests/template-flavors/another_location/wheezy+whonix-gateway/test_pre.sh new file mode 100755 index 0000000..9a4e120 --- /dev/null +++ b/tests/template-flavors/another_location/wheezy+whonix-gateway/test_pre.sh @@ -0,0 +1,4 @@ +#!/bin/sh +# vim: set ts=4 sw=4 sts=4 et : + +: diff --git a/tests/template-flavors/debian+whonix-gateway+gnome/test_pre.sh b/tests/template-flavors/debian+whonix-gateway+gnome/test_pre.sh new file mode 100755 index 0000000..9a4e120 --- /dev/null +++ b/tests/template-flavors/debian+whonix-gateway+gnome/test_pre.sh @@ -0,0 +1,4 @@ +#!/bin/sh +# vim: set ts=4 sw=4 sts=4 et : + +: diff --git a/tests/template-flavors/debian+whonix-gateway/test_pre.sh b/tests/template-flavors/debian+whonix-gateway/test_pre.sh new file mode 100755 index 0000000..9a4e120 --- /dev/null +++ b/tests/template-flavors/debian+whonix-gateway/test_pre.sh @@ -0,0 +1,4 @@ +#!/bin/sh +# vim: set ts=4 sw=4 sts=4 et : + +: diff --git a/tests/template-flavors/test.sh b/tests/template-flavors/test.sh new file mode 100755 index 0000000..eb8b5e1 --- /dev/null +++ b/tests/template-flavors/test.sh @@ -0,0 +1,162 @@ +#!/bin/sh +# vim: set ts=4 sw=4 sts=4 et : + +VERBOSE=2 +DEBUG=1 + +pushd ../.. +export ROOT_DIR=$(readlink -m .) + +# ------------------------------------------------------------------------------ +# Source external scripts +# ------------------------------------------------------------------------------ +. ./functions.sh +. ./tests/assert/assert.sh + +head() { + echo + echo + info "------------------------------------------------------------------------------" + info "${1%%\\n*}" + if ! [ "${1%%\\n*}" == "${1#*\\n}" ]; then + [[ -z $TEST ]] && echo -e "${bold}${green}${1#*\\n}${reset}" || : + fi + info "------------------------------------------------------------------------------" +} + +info() { + [[ -z $TEST ]] && echo -e "${bold}${blue}${1}${reset}" || : +} + +#debug() { +# [[ -z $TEST ]] && echo -e "${bold}${red}${1}${reset}" || : +#} + +assertTest(){ + TEST=True + printf "${bold}${red}" + assert "$1" "$2" + printf "${reset}" + unset TEST +} + +assertEnd() { + printf "${bold}${red}" + assert_end "$1" + printf "${reset}" +} + +# Defaults +export SCRIPTDIR="tests/template-flavors" +export DIST="wheezy" +export TEMPLATE_FLAVOR="whonix-gateway" + +# Should be parses in functions! +export TEMPLATE_FLAVOR_PREFIX="" + +# Just use error to show text in red +head "=== Globals ===" +debug 'export SCRIPTDIR="tests/template-flavors"' +debug 'export DIST="wheezy"' +debug 'export TEMPLATE_FLAVOR="whonix-gateway"' +debug 'export TEMPLATE_FLAVOR_PREFIX=""' +#debug "TEST=\"${TEST}\"" + +# ------------------------------------------------------------------------------ +head " 1. With TEMPLATE_FOLDER + \n tests/template-flavors/wheezy+whonix-gateway/test_pre.sh" +customStep "$0" "pre" +assertTest "customStep $0 pre" "tests/template-flavors/wheezy+whonix-gateway/test_pre.sh" +assertEnd "Test 1" + +# ------------------------------------------------------------------------------ +head " 2. Without TEMPLATE_FOLDER + \n tests/template-flavors/wheezy/test_pre.sh" +export TEMPLATE_FLAVOR="" +customStep "$0" "pre" +assertTest "customStep $0 pre" "tests/template-flavors/wheezy/test_pre.sh" +assertEnd "Test 2" + +# ------------------------------------------------------------------------------ +head " 3. Template Options + \n DISTS_VM = wheezy+whonix-gateway+gnome \ + \n DISTS_VM = +++ \ + \n Options get seperated into TEMPLATE_OPTIONS seperated by spaces" +# +export TEMPLATE_FLAVOR="whonix-gateway" +export TEMPLATE_OPTIONS=('gnome' 'kde') +customStep "$0" "pre" +debug "Not supposed to find wheezy+whonix-gateway+kde" +assertTest "customStep $0 pre" "tests/template-flavors/wheezy+whonix-gateway/test_pre.sh\ntests/template-flavors/wheezy+whonix-gateway+gnome/test_pre.sh" +assertEnd "Test 3" + +# ------------------------------------------------------------------------------ +head " 4. Template Options with custom prefix + \n TEMPLATE_FLAVOR_PREFIX \ + \n export TEMPLATE_FLAVOR_PREFIX=( \ + \n 'wheezy+whonix-gateway;debian+' \ + \n 'wheezy+whonix-workstation;debian+' \ + \n)" +export TEMPLATE_FLAVOR_PREFIX=( + 'wheezy+whonix-gateway;debian+' + 'wheezy+whonix-workstation;debian+' +) +customStep "$0" "pre" +debug "Not supposed to find debian+whonix-gateway+kde" +assertTest "customStep $0 pre" "tests/template-flavors/debian+whonix-gateway/test_pre.sh\ntests/template-flavors/wheezy+whonix-gateway+gnome/test_pre.sh" +assertEnd "Test 4" + +# ------------------------------------------------------------------------------ +head " 5. Template Options with NO prefix + \n TEMPLATE_FLAVOR_PREFIX \ + \n export TEMPLATE_FLAVOR_PREFIX=( \ + \n 'wheezy+whonix-gateway;' \ + \n 'wheezy+whonix-workstation;' \ + \n)" +export TEMPLATE_FLAVOR_PREFIX=( + 'wheezy+whonix-gateway;' + 'wheezy+whonix-workstation;' +) +customStep "$0" "pre" +debug "Not supposed to find whonix-gateway+kde" +assertTest "customStep $0 pre" "tests/template-flavors/whonix-gateway/test_pre.sh\ntests/template-flavors/wheezy+whonix-gateway+gnome/test_pre.sh" +assertEnd "Test 5" + +# ------------------------------------------------------------------------------ +head " 6. Custom template directory + \n unset TEMPLATE_FLAVOR_PREFIX \ + \n unset TEMPLATE_OPTIONS \ + \n TEMPLATE_FLAVOR_DIR=wheezy+whonix-gateway;tests/template-flavors/another_location" +unset TEMPLATE_FLAVOR_PREFIX +unset TEMPLATE_OPTIONS +TEMPLATE_FLAVOR_DIR="wheezy+whonix-gateway;tests/template-flavors/another_location" +customStep "$0" "pre" +assertTest "customStep $0 pre" "tests/template-flavors/another_location/wheezy+whonix-gateway/test_pre.sh" +assertEnd "Test 6" + +# ------------------------------------------------------------------------------ +head " 7. Custom template directory for options + \n unset TEMPLATE_FLAVOR_PREFIX \ + \n unset TEMPLATE_OPTIONS \ + \n TEMPLATE_FLAVOR_DIR=wheezy+whonix-gateway+gnome;tests/template-flavors/another_location" +unset TEMPLATE_FLAVOR_PREFIX +export TEMPLATE_OPTIONS=('gnome') +TEMPLATE_FLAVOR_DIR="wheezy+whonix-gateway+gnome;tests/template-flavors/another_location" +customStep "$0" "pre" +assertTest "customStep $0 pre" "tests/template-flavors/wheezy+whonix-gateway/test_pre.sh\ntests/template-flavors/another_location/wheezy+whonix-gateway+gnome/test_pre.sh" +assertEnd "Test 7" + +# ------------------------------------------------------------------------------ +export INSTALLDIR="${SCRIPTDIR}/test_copy_location" +head " 8. Copy files + \n Just test copying from here to ${INSTALLDIR}" +TEMPLATE_FLAVOR_DIR="" +TEMPLATE_OPTIONS="" +rm -rf "$INSTALLDIR"/* +copy_dirs "files" +ls -l "$INSTALLDIR" +assertTest "ls $INSTALLDIR" "test1\ntest2\ntest3" +assertEnd "Test 8" + +# Done +popd diff --git a/tests/template-flavors/test_copy_location/test1 b/tests/template-flavors/test_copy_location/test1 new file mode 100644 index 0000000..e69de29 diff --git a/tests/template-flavors/test_copy_location/test2 b/tests/template-flavors/test_copy_location/test2 new file mode 100644 index 0000000..e69de29 diff --git a/tests/template-flavors/test_copy_location/test3 b/tests/template-flavors/test_copy_location/test3 new file mode 100644 index 0000000..e69de29 diff --git a/tests/template-flavors/test_pre.sh b/tests/template-flavors/test_pre.sh new file mode 100755 index 0000000..9a4e120 --- /dev/null +++ b/tests/template-flavors/test_pre.sh @@ -0,0 +1,4 @@ +#!/bin/sh +# vim: set ts=4 sw=4 sts=4 et : + +: diff --git a/tests/template-flavors/wheezy+whonix-gateway+gnome/test_pre.sh b/tests/template-flavors/wheezy+whonix-gateway+gnome/test_pre.sh new file mode 100755 index 0000000..9a4e120 --- /dev/null +++ b/tests/template-flavors/wheezy+whonix-gateway+gnome/test_pre.sh @@ -0,0 +1,4 @@ +#!/bin/sh +# vim: set ts=4 sw=4 sts=4 et : + +: diff --git a/tests/template-flavors/wheezy+whonix-gateway/files/test1 b/tests/template-flavors/wheezy+whonix-gateway/files/test1 new file mode 100644 index 0000000..e69de29 diff --git a/tests/template-flavors/wheezy+whonix-gateway/files/test2 b/tests/template-flavors/wheezy+whonix-gateway/files/test2 new file mode 100644 index 0000000..e69de29 diff --git a/tests/template-flavors/wheezy+whonix-gateway/files/test3 b/tests/template-flavors/wheezy+whonix-gateway/files/test3 new file mode 100644 index 0000000..e69de29 diff --git a/tests/template-flavors/wheezy+whonix-gateway/test_pre.sh b/tests/template-flavors/wheezy+whonix-gateway/test_pre.sh new file mode 100755 index 0000000..9a4e120 --- /dev/null +++ b/tests/template-flavors/wheezy+whonix-gateway/test_pre.sh @@ -0,0 +1,4 @@ +#!/bin/sh +# vim: set ts=4 sw=4 sts=4 et : + +: diff --git a/tests/template-flavors/wheezy/test_pre.sh b/tests/template-flavors/wheezy/test_pre.sh new file mode 100755 index 0000000..9a4e120 --- /dev/null +++ b/tests/template-flavors/wheezy/test_pre.sh @@ -0,0 +1,4 @@ +#!/bin/sh +# vim: set ts=4 sw=4 sts=4 et : + +: diff --git a/tests/template-flavors/whonix-gateway+gnome/test_pre.sh b/tests/template-flavors/whonix-gateway+gnome/test_pre.sh new file mode 100755 index 0000000..9a4e120 --- /dev/null +++ b/tests/template-flavors/whonix-gateway+gnome/test_pre.sh @@ -0,0 +1,4 @@ +#!/bin/sh +# vim: set ts=4 sw=4 sts=4 et : + +: diff --git a/tests/template-flavors/whonix-gateway/test_pre.sh b/tests/template-flavors/whonix-gateway/test_pre.sh new file mode 100755 index 0000000..9a4e120 --- /dev/null +++ b/tests/template-flavors/whonix-gateway/test_pre.sh @@ -0,0 +1,4 @@ +#!/bin/sh +# vim: set ts=4 sw=4 sts=4 et : + +: