remove the whichs

Author: MartyEwings

files/common.sh

@@ -7,16 +7,16 @@ fail() {
   # Print a stderr: entry if there were anything printed to stderr
   if [[ -s $_tmp ]]; then
     # Hack to try and output valid json by replacing newlines with spaces.
-    $(/usr/bin/which echo) "{ \"status\": \"error\", \"message\": \"$1\", \"stderr\": \"$(tr '\n' ' ' <$_tmp)\" }"
+     echo "{ \"status\": \"error\", \"message\": \"$1\", \"stderr\": \"$(tr '\n' ' ' <$_tmp)\" }"
   else
-    $(/usr/bin/which echo) "{ \"status\": \"error\", \"message\": \"$1\" }"
+    echo "{ \"status\": \"error\", \"message\": \"$1\" }"
   fi
 
   exit ${2:-1}
 }
 
 success() {
-  $(/usr/bin/which echo) "$1"
+  echo "$1"
   exit 0
 }
 

tasks/reset_pgrepack_schema.sh

@@ -6,7 +6,7 @@ declare PT__installdir
 source "$PT__installdir/pe_databases/files/common.sh"
 
 #Determine if PE Postgres is available
-if puppet resource service pe-postgresql | $(/usr/bin/which grep) -q running; then
+if puppet resource service pe-postgresql | grep -q running; then
     #Remove the pg_repack extension
     su - pe-postgres -s '/bin/bash' -c '/opt/puppetlabs/server/bin/psql -d pe-puppetdb -c "DROP EXTENSION pg_repack CASCADE"' || fail "unable to drop pg_repack extension"