浏览代码

Remove xmpp entry from readme

Bob Mottram 8 年前
父节点
当前提交
cca901342b
共有 1 个文件被更改,包括 3 次插入6 次删除
  1. 3
    6
      src/freedombone-app-xmpp

+ 3
- 6
src/freedombone-app-xmpp 查看文件

@@ -287,6 +287,7 @@ function remove_xmpp {
287 287
 
288 288
     remove_completion_param install_xmpp
289 289
     sed -i '/xmpp/d' $COMPLETION_FILE
290
+    sed -i '/XMPP/d' /home/$MY_USERNAME/README
290 291
 }
291 292
 
292 293
 function xmpp_email_headers {
@@ -489,7 +490,7 @@ function install_xmpp_main {
489 490
     fi
490 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 494
         if [ ${#XMPP_PASSWORD} -lt 8 ]; then
494 495
             if [ -f $IMAGE_PASSWORD_FILE ]; then
495 496
                 XMPP_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
@@ -500,13 +501,9 @@ function install_xmpp_main {
500 501
         prosodyctl register $MY_USERNAME $DEFAULT_DOMAIN_NAME $XMPP_PASSWORD
501 502
         echo '' >> /home/$MY_USERNAME/README
502 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 505
         echo $"XMPP onion domain: ${XMPP_ONION_HOSTNAME}" >> /home/$MY_USERNAME/README
506 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 507
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
511 508
         chmod 600 /home/$MY_USERNAME/README
512 509
     fi