From 263ffe97cc2a8898f192f31270f1929123423ae7 Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Tue, 7 Sep 2021 09:02:22 -0500
Subject: [PATCH] Cleanup

---
 extras/add_vpn_user.sh      | 6 +++---
 extras/del_vpn_user.sh      | 4 ++--
 extras/update_vpn_users.sh  | 2 +-
 extras/vpnuninstall.sh      | 2 +-
 extras/vpnupgrade_amzn.sh   | 2 +-
 extras/vpnupgrade_centos.sh | 2 +-
 extras/vpnupgrade_ubuntu.sh | 2 +-
 vpnsetup_amzn.sh            | 2 +-
 vpnsetup_centos.sh          | 2 +-
 vpnsetup_ubuntu.sh          | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/extras/add_vpn_user.sh b/extras/add_vpn_user.sh
index 1b06478..1fff698 100755
--- a/extras/add_vpn_user.sh
+++ b/extras/add_vpn_user.sh
@@ -19,7 +19,7 @@ conf_bk() { /bin/cp -f "$1" "$1.old-$SYS_DT" 2>/dev/null; }
 add_vpn_user() {
 
 if [ "$(id -u)" != 0 ]; then
-  exiterr "Script must be run as root. Try 'sudo sh $0'"
+  exiterr "Script must be run as root. Try 'sudo bash $0'"
 fi
 
 if ! grep -qs "hwdsl2 VPN script" /etc/sysctl.conf \
@@ -38,8 +38,8 @@ VPN_PASSWORD=$2
 
 if [ -z "$VPN_USER" ] || [ -z "$VPN_PASSWORD" ]; then
 cat 1>&2 <<EOF
-Usage: sudo sh $0 'username_to_add' 'password'
-       sudo sh $0 'username_to_update' 'new_password'
+Usage: sudo bash $0 'username_to_add' 'password'
+       sudo bash $0 'username_to_update' 'new_password'
 EOF
   exit 1
 fi
diff --git a/extras/del_vpn_user.sh b/extras/del_vpn_user.sh
index 9398a00..da0f1c9 100755
--- a/extras/del_vpn_user.sh
+++ b/extras/del_vpn_user.sh
@@ -19,7 +19,7 @@ conf_bk() { /bin/cp -f "$1" "$1.old-$SYS_DT" 2>/dev/null; }
 del_vpn_user() {
 
 if [ "$(id -u)" != 0 ]; then
-  exiterr "Script must be run as root. Try 'sudo sh $0'"
+  exiterr "Script must be run as root. Try 'sudo bash $0'"
 fi
 
 if ! grep -qs "hwdsl2 VPN script" /etc/sysctl.conf \
@@ -35,7 +35,7 @@ VPN_USER=$1
 
 if [ -z "$VPN_USER" ]; then
 cat 1>&2 <<EOF
-Usage: sudo sh $0 'username_to_delete'
+Usage: sudo bash $0 'username_to_delete'
 EOF
   exit 1
 fi
diff --git a/extras/update_vpn_users.sh b/extras/update_vpn_users.sh
index 6a812ba..2dffd4e 100755
--- a/extras/update_vpn_users.sh
+++ b/extras/update_vpn_users.sh
@@ -41,7 +41,7 @@ noquotes2() { printf '%s' "$1" | sed -e 's/" "/ /g' -e "s/' '/ /g"; }
 update_vpn_users() {
 
 if [ "$(id -u)" != 0 ]; then
-  exiterr "Script must be run as root. Try 'sudo sh $0'"
+  exiterr "Script must be run as root. Try 'sudo bash $0'"
 fi
 
 if ! grep -qs "hwdsl2 VPN script" /etc/sysctl.conf \
diff --git a/extras/vpnuninstall.sh b/extras/vpnuninstall.sh
index e498122..db634a3 100755
--- a/extras/vpnuninstall.sh
+++ b/extras/vpnuninstall.sh
@@ -25,7 +25,7 @@ bigecho() { echo "## $1"; }
 
 check_root() {
   if [ "$(id -u)" != 0 ]; then
-    exiterr "Script must be run as root. Try 'sudo sh $0'"
+    exiterr "Script must be run as root. Try 'sudo bash $0'"
   fi
 }
 
diff --git a/extras/vpnupgrade_amzn.sh b/extras/vpnupgrade_amzn.sh
index 5ca249f..74baebe 100755
--- a/extras/vpnupgrade_amzn.sh
+++ b/extras/vpnupgrade_amzn.sh
@@ -27,7 +27,7 @@ bigecho() { echo "## $1"; }
 
 check_root() {
   if [ "$(id -u)" != 0 ]; then
-    exiterr "Script must be run as root. Try 'sudo sh $0'"
+    exiterr "Script must be run as root. Try 'sudo bash $0'"
   fi
 }
 
diff --git a/extras/vpnupgrade_centos.sh b/extras/vpnupgrade_centos.sh
index 4bb413f..61fecfa 100755
--- a/extras/vpnupgrade_centos.sh
+++ b/extras/vpnupgrade_centos.sh
@@ -27,7 +27,7 @@ bigecho() { echo "## $1"; }
 
 check_root() {
   if [ "$(id -u)" != 0 ]; then
-    exiterr "Script must be run as root. Try 'sudo sh $0'"
+    exiterr "Script must be run as root. Try 'sudo bash $0'"
   fi
 }
 
diff --git a/extras/vpnupgrade_ubuntu.sh b/extras/vpnupgrade_ubuntu.sh
index 02e436d..4108077 100755
--- a/extras/vpnupgrade_ubuntu.sh
+++ b/extras/vpnupgrade_ubuntu.sh
@@ -27,7 +27,7 @@ bigecho() { echo "## $1"; }
 
 check_root() {
   if [ "$(id -u)" != 0 ]; then
-    exiterr "Script must be run as root. Try 'sudo sh $0'"
+    exiterr "Script must be run as root. Try 'sudo bash $0'"
   fi
 }
 
diff --git a/vpnsetup_amzn.sh b/vpnsetup_amzn.sh
index 10d9cc1..bbb8a3e 100755
--- a/vpnsetup_amzn.sh
+++ b/vpnsetup_amzn.sh
@@ -48,7 +48,7 @@ check_ip() {
 
 check_root() {
   if [ "$(id -u)" != 0 ]; then
-    exiterr "Script must be run as root. Try 'sudo sh $0'"
+    exiterr "Script must be run as root. Try 'sudo bash $0'"
   fi
 }
 
diff --git a/vpnsetup_centos.sh b/vpnsetup_centos.sh
index dc3b93a..89f4ac3 100755
--- a/vpnsetup_centos.sh
+++ b/vpnsetup_centos.sh
@@ -49,7 +49,7 @@ check_ip() {
 
 check_root() {
   if [ "$(id -u)" != 0 ]; then
-    exiterr "Script must be run as root. Try 'sudo sh $0'"
+    exiterr "Script must be run as root. Try 'sudo bash $0'"
   fi
 }
 
diff --git a/vpnsetup_ubuntu.sh b/vpnsetup_ubuntu.sh
index ad5f31b..a5c7700 100755
--- a/vpnsetup_ubuntu.sh
+++ b/vpnsetup_ubuntu.sh
@@ -49,7 +49,7 @@ check_ip() {
 
 check_root() {
   if [ "$(id -u)" != 0 ]; then
-    exiterr "Script must be run as root. Try 'sudo sh $0'"
+    exiterr "Script must be run as root. Try 'sudo bash $0'"
   fi
 }