ソースを参照

Force option on user removal

Bob Mottram 8 年 前
コミット
b8c0bce0f1
共有2 個のファイルを変更した11 個の追加6 個の削除を含む
  1. 1
    1
      src/freedombone-adduser
  2. 10
    5
      src/freedombone-rmuser

+ 1
- 1
src/freedombone-adduser ファイルの表示

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

+ 10
- 5
src/freedombone-rmuser ファイルの表示

@@ -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