tests: misc: cleanup shell usage

Add quotes for most usages of variables.

Added ${} for variables.

Cleanup indentation to be consistent with other tests.

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>

1 files changed, 51 insertions, 51 deletions

diff --git a/tests/pkcs12-decode/pkcs12 b/tests/pkcs12-decode/pkcs12
index 0aa77468b6..0408ad169a 100755
--- a/tests/pkcs12-decode/pkcs12
+++ b/tests/pkcs12-decode/pkcs12
@@ -21,10 +21,10 @@
 # along with GnuTLS; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-srcdir=${srcdir:-.}
-top_builddir=${top_builddir:-../..}
-CERTTOOL=${CERTTOOL:-${top_builddir}/src/certtool$EXEEXT}
-DIFF=${DIFF:-diff}
+srcdir="${srcdir:-.}"
+top_builddir="${top_builddir:-../..}"
+CERTTOOL="${CERTTOOL:-${top_builddir}/src/certtool${EXEEXT}}"
+DIFF="${DIFF:-diff}"
 DEBUG=""
 
 if test "x$1" != "x";then
@@ -33,88 +33,88 @@ fi
 
 ret=0
 for p12 in 'client.p12 foobar' noclient.p12 unclient.p12 pkcs12_2certs.p12; do
-    set -- $p12
-    file=$1
-    passwd=$2
-    if test "x$DEBUG" != "x";then
-      $CERTTOOL -d 99 --p12-info --inder --password "$passwd" \
-		--infile $srcdir/$file
-    else
-      $CERTTOOL --p12-info --inder --password "$passwd" \
-		--infile $srcdir/$file >/dev/null 2>&1
-    fi
-    rc=$?
-    if test $rc != 0; then
-	echo "NEON PKCS12 FATAL $p12"
-	ret=1
-    fi
+  set -- ${p12}
+  file="$1"
+  passwd="$2"
+  if test "x$DEBUG" != "x";then
+    "${CERTTOOL}" -d 99 --p12-info --inder --password "${passwd}" \
+      --infile "${srcdir}/${file}"
+  else
+    "${CERTTOOL}" --p12-info --inder --password "${passwd}" \
+      --infile "${srcdir}/${file}" >/dev/null 2>&1
+  fi
+  rc=$?
+  if test ${rc} != 0; then
+    echo "NEON PKCS12 FATAL ${p12}"
+    ret=1
+  fi
 done
 
 file=test-null.p12
-$CERTTOOL --p12-info --inder --null-password --infile $srcdir/$file >/dev/null 2>&1
+"${CERTTOOL}" --p12-info --inder --null-password --infile "${srcdir}/${file}" >/dev/null 2>&1
 rc=$?
-if test $rc != 0; then
-	echo "PKCS12 FATAL $file"
-	ret=1
+if test ${rc} != 0; then
+  echo "PKCS12 FATAL ${file}"
+  ret=1
 fi
 
 file=sha256.p12
-$CERTTOOL --p12-info --inder --password 1234 --infile $srcdir/$file >/dev/null 2>&1
+"${CERTTOOL}" --p12-info --inder --password 1234 --infile "${srcdir}/${file}" >/dev/null 2>&1
 rc=$?
-if test $rc != 0; then
-	echo "PKCS12 FATAL $file"
-	ret=1
+if test ${rc} != 0; then
+  echo "PKCS12 FATAL ${file}"
+  ret=1
 fi
 
 # test whether we can encode a certificate and a key
-$CERTTOOL --to-p12 --password 1234 --p12-name "my-key" --load-certificate $srcdir/../certs/cert-ecc256.pem --load-privkey $srcdir/../certs/ecc256.pem --outder --outfile out.p12 >/dev/null 2>&1
+"${CERTTOOL}" --to-p12 --password 1234 --p12-name "my-key" --load-certificate "${srcdir}/../certs/cert-ecc256.pem" --load-privkey "${srcdir}/../certs/ecc256.pem" --outder --outfile out.p12 >/dev/null 2>&1
 rc=$?
-if test $rc != 0; then
-	echo "PKCS12 FATAL encoding"
-	ret=1
+if test ${rc} != 0; then
+  echo "PKCS12 FATAL encoding"
+  ret=1
 fi
 
-$CERTTOOL --p12-info --inder --password 1234 --infile out.p12 >out.pem 2>/dev/null
+"${CERTTOOL}" --p12-info --inder --password 1234 --infile out.p12 >out.pem 2>/dev/null
 rc=$?
-if test $rc != 0; then
-	echo "PKCS12 FATAL decrypting/decoding"
-	ret=1
+if test ${rc} != 0; then
+  echo "PKCS12 FATAL decrypting/decoding"
+  ret=1
 fi
 
 grep "BEGIN ENCRYPTED PRIVATE KEY" out.pem >/dev/null 2>&1
 rc=$?
 
-if test "$rc" != "0"; then
-  exit $rc
+if test "${rc}" != "0"; then
+  exit ${rc}
 fi
 
 grep "BEGIN CERTIFICATE" out.pem >/dev/null 2>&1
 rc=$?
 
-if test "$rc" != "0"; then
-  exit $rc
+if test "${rc}" != "0"; then
+  exit ${rc}
 fi
 
 # test whether we can encode a certificate, a key and a CA
-$CERTTOOL --to-p12 --password 123456 --p12-name "my-key" --load-certificate $srcdir/../certs/cert-ecc256.pem --load-privkey $srcdir/../certs/ecc256.pem --load-ca-certificate $srcdir/../certs/ca-cert-ecc.pem --outder --outfile out.p12 >/dev/null 2>&1
+"${CERTTOOL}" --to-p12 --password 123456 --p12-name "my-key" --load-certificate "${srcdir}/../certs/cert-ecc256.pem" --load-privkey "${srcdir}/../certs/ecc256.pem" --load-ca-certificate "${srcdir}/../certs/ca-cert-ecc.pem" --outder --outfile out.p12 >/dev/null 2>&1
 rc=$?
-if test $rc != 0; then
-	echo "PKCS12 FATAL encoding 2"
-	exit 1
+if test ${rc} != 0; then
+  echo "PKCS12 FATAL encoding 2"
+  exit 1
 fi
 
-$CERTTOOL --p12-info --inder --password 123456 --infile out.p12 >out.pem 2>/dev/null
+"${CERTTOOL}" --p12-info --inder --password 123456 --infile out.p12 >out.pem 2>/dev/null
 rc=$?
-if test $rc != 0; then
-	echo "PKCS12 FATAL decrypting/decoding 2"
-	exit 1
+if test ${rc} != 0; then
+  echo "PKCS12 FATAL decrypting/decoding 2"
+  exit 1
 fi
 
 grep "BEGIN ENCRYPTED PRIVATE KEY" out.pem >/dev/null 2>&1
 rc=$?
 
-if test "$rc" != "0"; then
-  exit $rc
+if test "${rc}" != "0"; then
+  exit ${rc}
 fi
 
 count=`grep -c "BEGIN CERTIFICATE" out.pem`
@@ -126,5 +126,5 @@ fi
 
 rm -f out.pem out.p12
 
-#echo "NEON PKCS12 DONE (rc $ret)"
-exit $ret
+#echo "NEON PKCS12 DONE (rc ${ret})"
+exit ${ret}