Pārlūkot izejas kodu

Force option on user removal

Bob Mottram 8 gadus atpakaļ
vecāks
revīzija
b8c0bce0f1
2 mainītis faili ar 11 papildinājumiem un 6 dzēšanām
  1. 1
    1
      src/freedombone-adduser
  2. 10
    5
      src/freedombone-rmuser

+ 1
- 1
src/freedombone-adduser Parādīt failu

212
         retval=$(add_user_${app_name} "$ADD_USERNAME" "$NEW_USER_PASSWORD")
212
         retval=$(add_user_${app_name} "$ADD_USERNAME" "$NEW_USER_PASSWORD")
213
         if [[ $retval != '0' ]]; then
213
         if [[ $retval != '0' ]]; then
214
             echo $"Failed with error code ${retval}"
214
             echo $"Failed with error code ${retval}"
215
-            ${PROJECT_NAME}-rmuser $ADD_USERNAME
215
+            ${PROJECT_NAME}-rmuser $ADD_USERNAME --force
216
             exit 672392
216
             exit 672392
217
         fi
217
         fi
218
         if ! grep -q "${app_name}_${ADD_USERNAME}" $APP_USERS_FILE; then
218
         if ! grep -q "${app_name}_${ADD_USERNAME}" $APP_USERS_FILE; then

+ 10
- 5
src/freedombone-rmuser Parādīt failu

51
 read_config_param MY_USERNAME
51
 read_config_param MY_USERNAME
52
 
52
 
53
 REMOVE_USERNAME=$1
53
 REMOVE_USERNAME=$1
54
+REMOVE_OPTIONS="$2"
54
 
55
 
55
 if [ ! $REMOVE_USERNAME ]; then
56
 if [ ! $REMOVE_USERNAME ]; then
56
     echo $'Please specify a username to remove'
57
     echo $'Please specify a username to remove'
93
     exit 8
94
     exit 8
94
 fi
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
 fi
106
 fi
102
 
107
 
103
 if [ -f /etc/nginx/.htpasswd ]; then
108
 if [ -f /etc/nginx/.htpasswd ]; then