Simplify die_if_error
* Replace die_if_error() with the simpler die()
* Attempt to clean up unnecessary trace output
* Formatting cleanups on all exercise scripts
Change-Id: I72a542b3a59ee9bf12bee6bcc605edd7579205e0
diff --git a/exercises/swift.sh b/exercises/swift.sh
index b70b85f..d8b41a3 100755
--- a/exercises/swift.sh
+++ b/exercises/swift.sh
@@ -1,10 +1,12 @@
#!/usr/bin/env bash
+# **swift.sh**
+
# Test swift via the command line tools that ship with it.
-echo "**************************************************"
+echo "*********************************************************************"
echo "Begin DevStack Exercise: $0"
-echo "**************************************************"
+echo "*********************************************************************"
# This script exits on an error so that errors don't compound and you see
# only the first error that occured.
@@ -39,27 +41,22 @@
# =============
# Check if we have to swift via keystone
-swift stat
-die_if_error "Failure geting status"
+swift stat || die "Failure geting status"
# We start by creating a test container
-swift post $CONTAINER
-die_if_error "Failure creating container $CONTAINER"
+swift post $CONTAINER || die "Failure creating container $CONTAINER"
# add some files into it.
-swift upload $CONTAINER /etc/issue
-die_if_error "Failure uploading file to container $CONTAINER"
+swift upload $CONTAINER /etc/issue || die "Failure uploading file to container $CONTAINER"
# list them
-swift list $CONTAINER
-die_if_error "Failure listing contents of container $CONTAINER"
+swift list $CONTAINER || die "Failure listing contents of container $CONTAINER"
# And we may want to delete them now that we have tested that
# everything works.
-swift delete $CONTAINER
-die_if_error "Failure deleting container $CONTAINER"
+swift delete $CONTAINER || die "Failure deleting container $CONTAINER"
set +o xtrace
-echo "**************************************************"
-echo "End DevStack Exercise: $0"
-echo "**************************************************"
+echo "*********************************************************************"
+echo "SUCCESS: End DevStack Exercise: $0"
+echo "*********************************************************************"