From bd36c616b4107fa765ef590eeb52a56db7b8b10a Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 11 Aug 2018 12:15:24 +0100
Subject: [PATCH] Can't remove admin user from webadmin
---
src/freedombone-installer | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/freedombone-installer b/src/freedombone-installer
index bca2954ab..0a5e136e0 100755
--- a/src/freedombone-installer
+++ b/src/freedombone-installer
@@ -1042,13 +1042,16 @@ function add_remove_users {
if [ ${#remove_username} -le 32 ]; then
if valid_username_characters "$remove_username"; then
if [ -d "/home/$remove_username" ]; then
- check_for_existing_processes $remove_user_script
- { echo "/usr/local/bin/${PROJECT_NAME}-rmuser $remove_username > $webadmin_install_dir/log.txt";
- echo "exit 0"; } >> $remove_user_script
- chmod +x $remove_user_script
+ admin_username=$(grep 'MY_USERNAME=' "$CONFIGURATION_FILE" | head -n 1 | awk -F '=' '{print $2}')
+ if [[ "$remove_username" != "$admin_username" ]]; then
+ check_for_existing_processes $remove_user_script
+ { echo "/usr/local/bin/${PROJECT_NAME}-rmuser $remove_username > $webadmin_install_dir/log.txt";
+ echo "exit 0"; } >> $remove_user_script
+ chmod +x $remove_user_script
- # run in a separate process
- ./$remove_user_script &
+ # run in a separate process
+ ./$remove_user_script &
+ fi
fi
fi
fi
--
GitLab