Browse Source

Check return code

Bob Mottram 9 years ago
parent
commit
20d65a0b7a
2 changed files with 10 additions and 1 deletions
  1. 5
    0
      src/freedombone-adduser
  2. 5
    1
      src/freedombone-addxmpp

+ 5
- 0
src/freedombone-adduser View File

97
 
97
 
98
 echo "Adding an XMPP account for $MY_USERNAME"
98
 echo "Adding an XMPP account for $MY_USERNAME"
99
 freedombone-addxmpp -e "$MY_USERNAME@$HOSTNAME" -p "$NEW_USER_PASSWORD"
99
 freedombone-addxmpp -e "$MY_USERNAME@$HOSTNAME" -p "$NEW_USER_PASSWORD"
100
+if [ ! "$?" = "0" ]; then
101
+    echo "XMPP account not created"
102
+    userdel -r $MY_USERNAME
103
+    exit 6  
104
+fi
100
 
105
 
101
 clear
106
 clear
102
 echo "New user $MY_USERNAME was created"
107
 echo "New user $MY_USERNAME was created"

+ 5
- 1
src/freedombone-addxmpp View File

64
 
64
 
65
 if [ ! -d /etc/prosody ]; then
65
 if [ ! -d /etc/prosody ]; then
66
     echo 'xmpp server is not installed'
66
     echo 'xmpp server is not installed'
67
-    exit 1
67
+    exit 0
68
 fi
68
 fi
69
 
69
 
70
 if [ ! $EMAIL_ADDRESS ]; then
70
 if [ ! $EMAIL_ADDRESS ]; then
71
     show_help
71
     show_help
72
+    exit 1
72
 fi
73
 fi
73
 
74
 
74
 if [ ! $NEW_USER_PASSWORD ]; then
75
 if [ ! $NEW_USER_PASSWORD ]; then
77
     USERNAME=$(echo $EMAIL_ADDRESS | awk -F '@' '{print $1}')
78
     USERNAME=$(echo $EMAIL_ADDRESS | awk -F '@' '{print $1}')
78
     DOMAIN_NAME=$(echo $EMAIL_ADDRESS | awk -F '@' '{print $2}')
79
     DOMAIN_NAME=$(echo $EMAIL_ADDRESS | awk -F '@' '{print $2}')
79
     prosodyctl register $USERNAME $DOMAIN_NAME "$NEW_USER_PASSWORD" 
80
     prosodyctl register $USERNAME $DOMAIN_NAME "$NEW_USER_PASSWORD" 
81
+    if [ ! "$?" = "0" ]; then
82
+        exit 2
83
+    fi
80
 fi
84
 fi
81
 
85
 
82
 exit 0
86
 exit 0