Просмотр исходного кода

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

Bob Mottram 7 лет назад
Родитель
Сommit
c0d73e0169
2 измененных файлов: 8 добавлений и 2 удалений
  1. 7
    1
      src/freedombone-app-syncthing
  2. 1
    1
      src/freedombone-controlpanel

+ 7
- 1
src/freedombone-app-syncthing Просмотреть файл

94
     SYNCTHING_ID=$(cat ~/.syncthing-server-id)
94
     SYNCTHING_ID=$(cat ~/.syncthing-server-id)
95
     dialog --title $"Device ID for ${PROJECT_NAME}" \
95
     dialog --title $"Device ID for ${PROJECT_NAME}" \
96
            --backtitle $"Freedombone User Control Panel" \
96
            --backtitle $"Freedombone User Control Panel" \
97
-           --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
97
+           --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
98
+    clear
99
+    echo $'Your Syncthing ID code'
100
+    echo ''
101
+    echo -n "$SYNCTHING_ID" | qrencode -t UTF8
102
+    echo ''
103
+    read -n1 -rsp $"Press any key to continue..." key
98
 }
104
 }
99
 
105
 
100
 function syncthing_add_id {
106
 function syncthing_add_id {

+ 1
- 1
src/freedombone-controlpanel Просмотреть файл

1312
     echo $'Tripwire Verification Code'
1312
     echo $'Tripwire Verification Code'
1313
     echo ''
1313
     echo ''
1314
     DBHASH=$(sha512sum  /var/lib/tripwire/${HOSTNAME}.twd)
1314
     DBHASH=$(sha512sum  /var/lib/tripwire/${HOSTNAME}.twd)
1315
-    echo "$DBHASH" | qrencode -t UTF8
1315
+    echo -n "$DBHASH" | qrencode -t UTF8
1316
     echo ''
1316
     echo ''
1317
     echo "$DBHASH"
1317
     echo "$DBHASH"
1318
     echo ''
1318
     echo ''