|
@@ -51,6 +51,7 @@ done
|
51
|
51
|
read_config_param MY_USERNAME
|
52
|
52
|
|
53
|
53
|
REMOVE_USERNAME=$1
|
|
54
|
+REMOVE_OPTIONS="$2"
|
54
|
55
|
|
55
|
56
|
if [ ! $REMOVE_USERNAME ]; then
|
56
|
57
|
echo $'Please specify a username to remove'
|
|
@@ -93,11 +94,15 @@ if [[ $REMOVE_USERNAME == $ADMIN_USERNAME ]]; then
|
93
|
94
|
exit 8
|
94
|
95
|
fi
|
95
|
96
|
|
96
|
|
-echo $'>>> REMOVE USER <<<'
|
97
|
|
-read -p $"Do you really wish to remove the user '$REMOVE_USERNAME' (y/n) ?" yn
|
98
|
|
-if [[ $yn != 'y' && $yn != 'Y' && $yn != 'yes' && $yn != 'Yes' && $yn != 'YES' ]]; then
|
99
|
|
- echo $"User $REMOVE_USERNAME was not removed"
|
100
|
|
- exit 9
|
|
97
|
+if [[ "$REMOVE_OPTIONS" != '-f' && "$REMOVE_OPTIONS" != '-y' && "$REMOVE_OPTIONS" != '--force' ]]; then
|
|
98
|
+ echo $'>>> REMOVE USER <<<'
|
|
99
|
+ read -p $"Do you really wish to remove the user '$REMOVE_USERNAME' (y/n) ?" yn
|
|
100
|
+ if [[ $yn != 'y' && $yn != 'Y' && $yn != 'yes' && $yn != 'Yes' && $yn != 'YES' ]]; then
|
|
101
|
+ echo $"User $REMOVE_USERNAME was not removed"
|
|
102
|
+ exit 9
|
|
103
|
+ fi
|
|
104
|
+else
|
|
105
|
+ echo $"Forced removal of user $REMOVE_USERNAME"
|
101
|
106
|
fi
|
102
|
107
|
|
103
|
108
|
if [ -f /etc/nginx/.htpasswd ]; then
|