Bladeren bron

Better handling of install failure

Bob Mottram 7 jaren geleden
bovenliggende
commit
bb18a8c9be
1 gewijzigde bestanden met toevoegingen van 5 en 1 verwijderingen
  1. 5
    1
      src/freedombone-app-bdsmail

+ 5
- 1
src/freedombone-app-bdsmail Bestand weergeven

@@ -239,7 +239,7 @@ function install_bdsmail {
239 239
     echo 'WantedBy=multi-user.target' >> /etc/systemd/system/bdsmail.service
240 240
     systemctl enable bdsmail
241 241
     chown -R bdsmail:bdsmail /etc/bdsmail
242
-    systemctl restart bdsmail
242
+    systemctl start bdsmail
243 243
 
244 244
     echo '#!/usr/bin/env python2' > /etc/bdsmail/get_address
245 245
     echo 'import base64, hashlib, sys' >> /etc/bdsmail/get_address
@@ -257,10 +257,14 @@ function install_bdsmail {
257 257
     sleep 15
258 258
     bds_domain=$(bdsmail_domain)
259 259
     if [ ! $bds_domain ]; then
260
+        echo $'Waiting...'
260 261
         sleep 15
261 262
         bds_domain=$(bdsmail_domain)
262 263
         if [ ! $bds_domain ]; then
263 264
             echo $'Failed to get the bdsmail domain'
265
+            systemctl stop bdsmail
266
+            systemctl disable bdsmail
267
+            remove_i2p
264 268
             exit 8934638
265 269
         fi
266 270
     fi