From 69fe19ca74ce5b00fa6d120ee6d20707443e5cea Mon Sep 17 00:00:00 2001 From: Christian Höltje Date: Wed, 27 Jun 2018 11:17:08 -0400 Subject: test-in-docker: fix in zsh > 5.3 The way I was filtering out entries in the frameworks array stopped working in newer versions of ZSH; it would convert the array into a string (you could see it with `typeset -p frameworks`) So I rewrote it. I don't see anything in the release notes for ZSH that would explain this and I didn't find any option that would restore this behavior. Related: #882 --- test-in-docker | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'test-in-docker') diff --git a/test-in-docker b/test-in-docker index 3c7255ec..d291402f 100755 --- a/test-in-docker +++ b/test-in-docker @@ -21,7 +21,10 @@ versions=( docker/base-*/Dockerfile(N.on:h:t:s/base-//) ) # List of frameworks typeset -a frameworks frameworks=( docker/*/Dockerfile(N.on:h:t) ) -frameworks=${(@)frameworks:#base-*} +for i in {$#frameworks..1}; do + # Remove all base entries + [[ "${frameworks[$i]}" = base-* ]] && frameworks[$i]=() +done # Known Issues typeset -A known_issues -- cgit v1.2.3 From 645034f74c6daca97c06f3dc99ae00e98522af49 Mon Sep 17 00:00:00 2001 From: Christian Höltje Date: Wed, 27 Jun 2018 11:21:01 -0400 Subject: test-in-docker: add additional warnings --- test-in-docker | 1 + 1 file changed, 1 insertion(+) (limited to 'test-in-docker') diff --git a/test-in-docker b/test-in-docker index d291402f..89a223f1 100755 --- a/test-in-docker +++ b/test-in-docker @@ -6,6 +6,7 @@ set -eu default_version='4.3.11' setopt extended_glob glob_subst numeric_glob_sort +setopt warn_create_global warn_nested_var 2> /dev/null cd "${${(%):-%x}:A:h}" # TODO: Crazy Logic to munge TERM to something supported in Ubuntu 14.04 -- cgit v1.2.3 From 89863209fc81a70f6affa96ebd7df950cc3f8575 Mon Sep 17 00:00:00 2001 From: Christian Höltje Date: Wed, 27 Jun 2018 11:21:23 -0400 Subject: test-in-docker: make vars sorted and readonly Marking variables as readonly is helpful for debugging and preventing problems. --- test-in-docker | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'test-in-docker') diff --git a/test-in-docker b/test-in-docker index 89a223f1..f4e8e1c8 100755 --- a/test-in-docker +++ b/test-in-docker @@ -16,16 +16,18 @@ term=screen-256color # ...see Modifiers in zshexpn(1) for details. # List of ZSH versions -typeset -a versions +typeset -aU versions versions=( docker/base-*/Dockerfile(N.on:h:t:s/base-//) ) +typeset -r versions # List of frameworks -typeset -a frameworks +typeset -aU frameworks frameworks=( docker/*/Dockerfile(N.on:h:t) ) for i in {$#frameworks..1}; do # Remove all base entries [[ "${frameworks[$i]}" = base-* ]] && frameworks[$i]=() done +typeset -r frameworks # Known Issues typeset -A known_issues @@ -34,6 +36,7 @@ known_issues["4.3.11-zim"]="BROKEN: Zim wants ZSH 5.2 or newer." known_issues["5.0.3-zim"]="DEPRECATED: Zim wants ZSH 5.2 or newer." known_issues["5.1.1-zim"]="DEPRECATED: Zim wants ZSH 5.2 or newer." known_issues["4.3.11-zulu"]="Zulu doesn't work; it needs a newer version of git." +typeset -r known_issues err() { @@ -178,6 +181,8 @@ while (( $# > 0 )); do shift done +typeset -r use_version use_framework + build_and_run "$use_version" "$use_framework" # EOF -- cgit v1.2.3 From 83abdf742c04eae76b64a6fd22540373bd12f456 Mon Sep 17 00:00:00 2001 From: Christian Höltje Date: Wed, 27 Jun 2018 11:25:12 -0400 Subject: test-in-docker: add dry-run mode --- test-in-docker | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'test-in-docker') diff --git a/test-in-docker b/test-in-docker index f4e8e1c8..98257fc3 100755 --- a/test-in-docker +++ b/test-in-docker @@ -72,6 +72,14 @@ check_for_known_issues() { fi } +cmd() { + if (( dry_run )); then + echo "${(@q)*}" 1>&2 + else + "${(@)*}" + fi +} + build_and_run() { local version="$1" local framework="$2" @@ -82,14 +90,14 @@ build_and_run() { print -P "%F{green}Preparing containers...%f" echo -n "p9k:base-${version}: " - docker build \ + cmd docker build \ --quiet \ --tag "p9k:base-${version}" \ --file "docker/base-${version}/Dockerfile" \ . echo -n "p9k:${version}-${framework}: " - docker build \ + cmd docker build \ --quiet \ --build-arg="base=base-${version}" \ --tag "p9k:${version}-${framework}" \ @@ -97,7 +105,7 @@ build_and_run() { . print -P "%F{green}Starting ${name} container...%f" - exec docker run \ + cmd docker run \ --rm \ --interactive \ --tty \ @@ -112,9 +120,10 @@ show_help() { echo echo "Loads up a docker image with powershell9k configured in " echo - echo " --frameworks Lists all available frameworks, newline separated." - echo " --versions Lists all available ZSH versions, newline separated." - echo " --zsh VER Uses ZSH with version VER." + echo " -f --frameworks Lists all available frameworks, newline separated." + echo " -v --versions Lists all available ZSH versions, newline separated." + echo " -z --zsh VER Uses ZSH with version VER." + echo " -n --dry-run Just prints the docker commands that would be run." echo " --help You're soaking in it." echo echo "ZSH versions:" @@ -137,6 +146,7 @@ fi # Parse flags and such. use_version=$default_version use_framework= +dry_run=0 while (( $# > 0 )); do case "$1" in -f | --frameworks ) @@ -156,6 +166,7 @@ while (( $# > 0 )); do err "No such ZSH version '${1}'" fi ;; + -n | --dry-run ) dry_run=1 ;; -h | --help ) show_help exit @@ -181,7 +192,7 @@ while (( $# > 0 )); do shift done -typeset -r use_version use_framework +typeset -r use_version use_framework dry_run build_and_run "$use_version" "$use_framework" -- cgit v1.2.3 From 3c27414e7e985536a8b286d09b2248e7dee8263e Mon Sep 17 00:00:00 2001 From: Christian Höltje Date: Wed, 27 Jun 2018 16:52:16 -0400 Subject: test-in-docker: lint from @dritter --- test-in-docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test-in-docker') diff --git a/test-in-docker b/test-in-docker index 98257fc3..e55c9422 100755 --- a/test-in-docker +++ b/test-in-docker @@ -25,7 +25,7 @@ typeset -aU frameworks frameworks=( docker/*/Dockerfile(N.on:h:t) ) for i in {$#frameworks..1}; do # Remove all base entries - [[ "${frameworks[$i]}" = base-* ]] && frameworks[$i]=() + [[ "${frameworks[$i]}" == base-* ]] && frameworks[$i]=() done typeset -r frameworks -- cgit v1.2.3 From a94df3ddcb027d88717f854cd5f610a771c1c71c Mon Sep 17 00:00:00 2001 From: Christian Höltje Date: Wed, 27 Jun 2018 16:52:38 -0400 Subject: test-in-docker: resolve version and framework late --- test-in-docker | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) (limited to 'test-in-docker') diff --git a/test-in-docker b/test-in-docker index e55c9422..0ed1254f 100755 --- a/test-in-docker +++ b/test-in-docker @@ -2,8 +2,9 @@ set -eu -# The default ZSH to use. -default_version='4.3.11' +# The default ZSH to use; it can just be the first few characters. +# This should be the oldest version we support. +default_version='4.' setopt extended_glob glob_subst numeric_glob_sort setopt warn_create_global warn_nested_var 2> /dev/null @@ -144,8 +145,8 @@ if (( $# == 0 )); then fi # Parse flags and such. -use_version=$default_version -use_framework= +asked_for_version=$default_version +asked_for_framework= dry_run=0 while (( $# > 0 )); do case "$1" in @@ -159,12 +160,7 @@ while (( $# > 0 )); do ;; -z | --zsh ) shift - local v="$(resolve_version "$1")" - if [[ -n "$v" ]]; then - use_version=$v - else - err "No such ZSH version '${1}'" - fi + asked_for_version=$1 ;; -n | --dry-run ) dry_run=1 ;; -h | --help ) @@ -177,22 +173,27 @@ while (( $# > 0 )); do exit 1 ;; * ) - if [[ -z "$use_framework" ]]; then - local f="$(resolve_framework "$1")" - if [[ -n "$f" ]]; then - use_framework=$f - else - err "No such framework '${1}'" - fi + if [[ -z "$asked_for_framework" ]]; then + asked_for_framework=$1 else - err "You can only specify one framework at a time; you already specified '${use_framework}'" + err "You can only specify one framework at a time; you already specified '${asked_for_framework}'" fi ;; esac shift done -typeset -r use_version use_framework dry_run +typeset -r asked_for_version asked_for_framework + +typeset -r use_version="$(resolve_version "${asked_for_version}")" +if [[ -z "$use_version" ]]; then + err "No such ZSH version '${asked_for_version}'" +fi + +typeset -r use_framework="$(resolve_framework "${asked_for_framework}")" +if [[ -z "$use_framework" ]]; then + err "No such framework '${asked_for_framework}'" +fi build_and_run "$use_version" "$use_framework" -- cgit v1.2.3