Merge branch 'stretch' of https://github.com/bashrc/freedombone

src/freedombone-app-syncthing

@@ -94,7 +94,13 @@ function syncthing_show_id {
     SYNCTHING_ID=$(cat ~/.syncthing-server-id)
     dialog --title $"Device ID for ${PROJECT_NAME}" \
            --backtitle $"Freedombone User Control Panel" \
-           --msgbox $"In a desktop terminal press shift and select the ID below,\nthen right click and copy.\n\nWithin Connectbot select Menu/Copy and then highlight the ID below\n\n$SYNCTHING_ID" 12 78
+           --msgbox $"In a desktop terminal press shift and select the ID below,\nthen right click and copy.\n\nWithin Connectbot select Menu/Copy and then highlight the ID below\n\n$SYNCTHING_ID\n\nAlternatively press Enter to display a QR code which can be scanned." 13 78
+    clear
+    echo $'Your Syncthing ID code'
+    echo ''
+    echo -n "$SYNCTHING_ID" | qrencode -t UTF8
+    echo ''
+    read -n1 -rsp $"Press any key to continue..." key
 }
 
 function syncthing_add_id {

src/freedombone-controlpanel

@@ -1312,7 +1312,7 @@ function show_tripwire_verification_code {
     echo $'Tripwire Verification Code'
     echo ''
     DBHASH=$(sha512sum  /var/lib/tripwire/${HOSTNAME}.twd)
-    echo "$DBHASH" | qrencode -t UTF8
+    echo -n "$DBHASH" | qrencode -t UTF8
     echo ''
     echo "$DBHASH"
     echo ''