PR changes

Create usage function in backup script
Remove extra blank line
Correct usage and remove spurious comment in vacuum script

Author: m0dular

files/puppet_enterprise_database_backup.sh

@@ -1,5 +1,10 @@
 #!/bin/bash
 
+usage() {
+  echo "usage: $0  [-t BACKUP_TARGET] [-l LOG_DIRECTORY] [-r retention] <DATABASE> [DATABASE_N ...]"
+  exit 1
+}
+
 while [[ $1 ]]; do
   case "$1" in
     -t)
@@ -30,10 +35,7 @@ done
 databases=("$@")
 # shellcheck disable=SC2128
 # We only care if the array contains any elements
-[[ $databases ]] || {
-  echo "Usage: $0  [-t BACKUP_TARGET] [-l LOG_DIRECTORY] [-r retention] <DATABASE> [DATABASE_N ...]"
-  exit 1
-}
+[[ $databases ]] || usage
 
 [[ $pg_version ]] || pg_version="$(/usr/local/bin/facter -p pe_postgresql_info.installed_server_version)"
 backup_dir="${backup_dir:-/opt/puppetlabs/server/data/postgresql/$pg_version/backups}"
@@ -64,7 +66,6 @@ for db in "${databases[@]}"; do
     rm -f -- "${backups[@]:0:$offset}"
   fi
 
-
   echo "Starting dump of database: $db"
 
   if [[ $db == 'pe-classifier' ]]; then

files/vacuum_full_tables.sh

@@ -2,8 +2,9 @@
 
 usage() {
   cat <<EOF
-echo "usage: $0 <table>"
-where <table> is one of: facts catalogs other
+echo "usage: $0 <table set> [sleep duration]"
+where <table set> is one of: facts catalogs other
+and [sleep duration] is an optional integer of seconds to sleep.  Defaults to 300
 EOF
   exit 1
 }
@@ -12,7 +13,6 @@ EOF
 
 sleep_duration="${2:-300}"
 
-# TODO: Is this used in PE 2018 and newer? RE: fact_values
 case "$1" in
   'facts')
     vacuum_tables=("'facts'" "'factsets'" "'fact_paths'" "'fact_values'")