Parcourir la source

Remove xmpp entry from readme

Bob Mottram il y a 8 ans
Parent
révision
cca901342b
1 fichiers modifiés avec 3 ajouts et 6 suppressions
  1. 3
    6
      src/freedombone-app-xmpp

+ 3
- 6
src/freedombone-app-xmpp Voir le fichier

287
 
287
 
288
     remove_completion_param install_xmpp
288
     remove_completion_param install_xmpp
289
     sed -i '/xmpp/d' $COMPLETION_FILE
289
     sed -i '/xmpp/d' $COMPLETION_FILE
290
+    sed -i '/XMPP/d' /home/$MY_USERNAME/README
290
 }
291
 }
291
 
292
 
292
 function xmpp_email_headers {
293
 function xmpp_email_headers {
489
     fi
490
     fi
490
     set_completion_param "xmpp onion domain" "${XMPP_ONION_HOSTNAME}"
491
     set_completion_param "xmpp onion domain" "${XMPP_ONION_HOSTNAME}"
491
 
492
 
492
-    if ! grep -q "Your xmpp password is" /home/$MY_USERNAME/README; then
493
+    if ! grep -q "Your XMPP password is" /home/$MY_USERNAME/README; then
493
         if [ ${#XMPP_PASSWORD} -lt 8 ]; then
494
         if [ ${#XMPP_PASSWORD} -lt 8 ]; then
494
             if [ -f $IMAGE_PASSWORD_FILE ]; then
495
             if [ -f $IMAGE_PASSWORD_FILE ]; then
495
                 XMPP_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
496
                 XMPP_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
500
         prosodyctl register $MY_USERNAME $DEFAULT_DOMAIN_NAME $XMPP_PASSWORD
501
         prosodyctl register $MY_USERNAME $DEFAULT_DOMAIN_NAME $XMPP_PASSWORD
501
         echo '' >> /home/$MY_USERNAME/README
502
         echo '' >> /home/$MY_USERNAME/README
502
         echo '' >> /home/$MY_USERNAME/README
503
         echo '' >> /home/$MY_USERNAME/README
503
-        echo $'XMPP' >> /home/$MY_USERNAME/README
504
-        echo '====' >> /home/$MY_USERNAME/README
504
+        echo $'* XMPP' >> /home/$MY_USERNAME/README
505
         echo $"XMPP onion domain: ${XMPP_ONION_HOSTNAME}" >> /home/$MY_USERNAME/README
505
         echo $"XMPP onion domain: ${XMPP_ONION_HOSTNAME}" >> /home/$MY_USERNAME/README
506
         echo $"Your XMPP password is: $XMPP_PASSWORD" >> /home/$MY_USERNAME/README
506
         echo $"Your XMPP password is: $XMPP_PASSWORD" >> /home/$MY_USERNAME/README
507
-        echo $'You can change it with: ' >> /home/$MY_USERNAME/README
508
-        echo '' >> /home/$MY_USERNAME/README
509
-        echo "    prosodyctl passwd $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/README
510
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
507
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
511
         chmod 600 /home/$MY_USERNAME/README
508
         chmod 600 /home/$MY_USERNAME/README
512
     fi
509
     fi