From dd450b194c25fd26d9f81da1fbb4d49d650f9847 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Sat, 3 Jun 2017 16:46:31 +0200 Subject: [PATCH] upd: remove unneccesary quotes in [[ Word Splitting is disabled in [[ ]] expressions. Change-Id: Ie2f4f229a84ea3acaa5a8a8ef814066ae1711504 --- commands | 12 ++++++------ modules/hop/templates/commands.epp | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/commands b/commands index 4dd7f4d..6f6d00d 100755 --- a/commands +++ b/commands @@ -1,12 +1,12 @@ #!/bin/bash com="$SSH_ORIGINAL_COMMAND" -if [[ "$UID" == 0 ]]; then +if [[ $UID == 0 ]]; then echo "Run script as non-root-user" exit fi -if [[ "$com" == "update certs" || "$com" == "force update certs" ]]; then +if [[ $com == "update certs" || $com == "force update certs" ]]; then force=false - if [[ "$com" == "force update certs" ]]; then + if [[ $com == "force update certs" ]]; then force=true fi folder=$(mktemp -d) @@ -20,7 +20,7 @@ if [[ "$com" == "update certs" || "$com" == "force update certs" ]]; then openssl req -newkey rsa:4096 -subj "/CN=will-be-ignored" -nodes -out $folder/web.req -keyout $folder/web.key 2>/dev/null cat $folder/web.req read -r response - if [[ "$response" == "SUCCESS" ]]; then + if [[ $response == "SUCCESS" ]]; then # read certificate count read -r len printf '' > $folder/web.crt @@ -55,12 +55,12 @@ if [[ "$com" == "update certs" || "$com" == "force update certs" ]]; then [[ -f $folder/web.req ]] && rm $folder/web.req [[ -f $folder/web.key ]] && rm $folder/web.key rmdir $folder -elif [[ "$com" == "reload certs" ]]; then +elif [[ $com == "reload certs" ]]; then sudo puppet apply /etc/puppet/code/environments/production/manifests --verbose sudo lxc-attach -n front-nginx -- puppet agent --verbose --test sudo lxc-attach -n quiz -- puppet agent --verbose --test sudo lxc-attach -n gigi -- puppet agent --verbose --test -elif [[ "$com" == "update crls" ]]; then +elif [[ $com == "update crls" ]]; then if ! tar xv -C /data/crl; then echo "requiring tar" exit; diff --git a/modules/hop/templates/commands.epp b/modules/hop/templates/commands.epp index 8cedfd9..7c91e14 100755 --- a/modules/hop/templates/commands.epp +++ b/modules/hop/templates/commands.epp @@ -1,12 +1,12 @@ #!/bin/bash com="$SSH_ORIGINAL_COMMAND" -if [[ "$com" == "update certs" || "$com" == "force update certs" ]]; then +if [[ $com == "update certs" || $com == "force update certs" ]]; then exec ssh <%=$administrativeUser%>@10.0.3.1 "$com" -elif [[ "$com" == "reload certs" ]]; then +elif [[ $com == "reload certs" ]]; then # requires sudo --> requires terminal exec ssh -t <%=$administrativeUser%>@10.0.3.1 "reload certs" -elif [[ "$com" == "update crls" ]]; then +elif [[ $com == "update crls" ]]; then exec ssh <%=$administrativeUser%>@10.0.3.1 "update crls" else echo $com -- 2.39.2