Bladeren bron

Check that xmpp is installed before adding user

Bob Mottram 9 jaren geleden
bovenliggende
commit
5a0e192f48
1 gewijzigde bestanden met toevoegingen van 8 en 6 verwijderingen
  1. 8
    6
      src/freedombone-adduser

+ 8
- 6
src/freedombone-adduser Bestand weergeven

@@ -178,12 +178,14 @@ chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
178 178
 chown $MY_USERNAME:$MY_USERNAME $MY_GPG_PUBLIC_KEY
179 179
 chmod 600 /home/$MY_USERNAME/README
180 180
 
181
-echo "Adding an XMPP account for $MY_USERNAME"
182
-freedombone-addxmpp -e "$MY_USERNAME@$HOSTNAME" -p "$NEW_USER_PASSWORD"
183
-if [ ! "$?" = "0" ]; then
184
-    echo "XMPP account not created"
185
-    userdel -r $MY_USERNAME
186
-    exit 8
181
+if grep -q "install_xmpp" $COMPLETION_FILE; then
182
+    echo "Adding an XMPP account for $MY_USERNAME"
183
+    freedombone-addxmpp -e "$MY_USERNAME@$HOSTNAME" -p "$NEW_USER_PASSWORD"
184
+    if [ ! "$?" = "0" ]; then
185
+        echo "XMPP account not created"
186
+        userdel -r $MY_USERNAME
187
+        exit 8
188
+    fi
187 189
 fi
188 190
 
189 191
 if grep -q "Blog domain" $COMPLETION_FILE; then