From 8d6dd209dda4cc88b79a9e11906d7fbad7b4ef72 Mon Sep 17 00:00:00 2001
From: Bryan Roessler <bryanroessler@gmail.com>
Date: Thu, 12 Jun 2025 01:20:44 -0400
Subject: [PATCH] Cleanup scripts

---
 scripts/usr/local/bin/README.md            | 1 -
 scripts/usr/local/bin/script-deploy-manual | 2 +-
 scripts/usr/local/bin/script-functions     | 2 +-
 scripts/usr/local/bin/script-user-add      | 4 ++--
 scripts/usr/local/bin/script-user-remove   | 4 ++--
 scripts/usr/local/bin/script-user-unban    | 4 ++--
 6 files changed, 8 insertions(+), 9 deletions(-)
 delete mode 100644 scripts/usr/local/bin/README.md

diff --git a/scripts/usr/local/bin/README.md b/scripts/usr/local/bin/README.md
deleted file mode 100644
index b49bd7e0..00000000
--- a/scripts/usr/local/bin/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# RHEL Management Scripts
\ No newline at end of file
diff --git a/scripts/usr/local/bin/script-deploy-manual b/scripts/usr/local/bin/script-deploy-manual
index 65c016b1..d4668c7c 100755
--- a/scripts/usr/local/bin/script-deploy-manual
+++ b/scripts/usr/local/bin/script-deploy-manual
@@ -53,5 +53,5 @@ script-deploy-manual() {
 # Allow script to be safely sourced
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
   script-deploy-manual "$@"
-  exit $?
+  exit
 fi
\ No newline at end of file
diff --git a/scripts/usr/local/bin/script-functions b/scripts/usr/local/bin/script-functions
index 499b411b..35942deb 100644
--- a/scripts/usr/local/bin/script-functions
+++ b/scripts/usr/local/bin/script-functions
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Common functions for the lab scripts
+# Common functions
 # Copyright 2021-2025 Bryan C. Roessler
 # Licensed under the Apache License, Version 2.0
 
diff --git a/scripts/usr/local/bin/script-user-add b/scripts/usr/local/bin/script-user-add
index 5ff7db77..376b9a67 100755
--- a/scripts/usr/local/bin/script-user-add
+++ b/scripts/usr/local/bin/script-user-add
@@ -4,9 +4,9 @@
 # Licensed under the Apache License, Version 2.0
 p="${BASH_SOURCE[0]%/*}"; [[ -r $p/script-functions ]] && . "$p"/script-functions || exit 1
 
-is_root
+echo "Usage: sudo $0 [username] [password]"
 
-echo "Usage: $0 [username] [password]"
+is_root
 
 case $# in
   0) prompt user; prompt password ;;
diff --git a/scripts/usr/local/bin/script-user-remove b/scripts/usr/local/bin/script-user-remove
index c7b50c06..67bfaff9 100755
--- a/scripts/usr/local/bin/script-user-remove
+++ b/scripts/usr/local/bin/script-user-remove
@@ -4,9 +4,9 @@
 # Licensed under the Apache License, Version 2.0
 p="${BASH_SOURCE[0]%/*}"; [[ -r $p/script-functions ]] && . "$p"/script-functions || exit 1
 
-is_root
+echo "Usage: sudo $0 [username]"
 
-echo "This script supports one optional argument, a username"
+is_root
 
 if [[ $# -eq 1 ]]; then
   user="$1"
diff --git a/scripts/usr/local/bin/script-user-unban b/scripts/usr/local/bin/script-user-unban
index e9d31f85..bfa1fd96 100755
--- a/scripts/usr/local/bin/script-user-unban
+++ b/scripts/usr/local/bin/script-user-unban
@@ -4,9 +4,9 @@
 # Licensed under the Apache License, Version 2.0
 p="${BASH_SOURCE[0]%/*}"; [[ -r $p/script-functions ]] && . "$p"/script-functions || exit 1
 
-is_root
+echo "Usage: sudo $0 [ip_address]"
 
-echo "This script supports one optional argument, an IP address"
+is_root
 
 if [[ $# -eq 1 ]]; then
     ip_address="$1"