diff options
| author | Ed Santiago <santiago@redhat.com> | 2019-05-02 05:49:50 -0600 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2019-05-02 08:14:59 -0600 |
| commit | 295c531ecec8661408f01ac4e015d75fec865376 (patch) | |
| tree | 207a92de67c76264dc4563588e84a261facb8570 /contrib/cirrus/setup_container_environment.sh | |
| parent | 7d05ff3fc772a7be4860ed4a3cd59a62f8bb893a (diff) | |
| download | podman-295c531ecec8661408f01ac4e015d75fec865376.tar.gz podman-295c531ecec8661408f01ac4e015d75fec865376.tar.bz2 podman-295c531ecec8661408f01ac4e015d75fec865376.zip | |
cirrus lib.sh: refactor req_env_var()
Existing code was not working due to a bash gotcha ('exit'
from a pipeline). It also had unnecessary duplication.
New version is safer; also includes unit tests run under localunit.
Existing invocations of req_env_var replaced via:
$ [ edit setup_environment.sh, move one closing quote to its own line ]
$ perl -ni -e 's/(?<=req_env_var )"(\S+)\s+\$\1"/$1/; if (/req_env_var "$/ .. /^\s*"/) { chomp; s/(?<=\S)\s.*//; if (/^\s*"/) { print "\n" } else { unless (/req_env_var/) { s/^\s+//; print " ";} print;} } else { print }' $(ack -l req_env_var)
$ [ hand-massage an incorrect instance of '@' in lib.sh:ircmsg() ]
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'contrib/cirrus/setup_container_environment.sh')
| -rwxr-xr-x | contrib/cirrus/setup_container_environment.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/contrib/cirrus/setup_container_environment.sh b/contrib/cirrus/setup_container_environment.sh index 23df4fe8b..eda6f6167 100755 --- a/contrib/cirrus/setup_container_environment.sh +++ b/contrib/cirrus/setup_container_environment.sh @@ -3,11 +3,7 @@ set -e source $(dirname $0)/lib.sh -req_env_var " -GOSRC $GOSRC -OS_RELEASE_ID $OS_RELEASE_ID -CONTAINER_RUNTIME $CONTAINER_RUNTIME -" +req_env_var GOSRC OS_RELEASE_ID CONTAINER_RUNTIME DIST=$OS_RELEASE_ID IMAGE=${DIST}podmanbuild |