浏览代码

Improve final install instructions for onion variant

Bob Mottram 8 年前
父节点
当前提交
f9f56b2784
共有 1 个文件被更改,包括 4 次插入2 次删除
  1. 4
    2
      src/freedombone-image-customise

+ 4
- 2
src/freedombone-image-customise 查看文件

401
     echo '            shred -zu ~/login.txt' >> $rootdir/root/.bashrc
401
     echo '            shred -zu ~/login.txt' >> $rootdir/root/.bashrc
402
     END_MESSAGE1=$'Congratulations!'
402
     END_MESSAGE1=$'Congratulations!'
403
     if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "usb" ]]; then
403
     if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "usb" ]]; then
404
-        END_MESSAGE2=$'\nYour system has now installed\n\nThe onion ssh service is at $SSH_ONION_HOSTNAME\n\nPress any key to reboot and begin using it'
404
+        END_MESSAGE2=$'\nYour system has now installed\n\nThe onion ssh service is at:\n\n  ssh ${MY_USERNAME}@${SSH_ONION_HOSTNAME} -p ${SSH_PORT}\n\nTo copy the above address hold down the shift key and double left click on it, then right click and select "copy".\n\nPress any key to reboot and begin using the system'
405
         echo '            SSH_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_ssh/hostname)' >> $rootdir/root/.bashrc
405
         echo '            SSH_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_ssh/hostname)' >> $rootdir/root/.bashrc
406
 
406
 
407
         echo '            if [ ${#SSH_ONION_HOSTNAME} -lt 2 ]; then' >> $rootdir/root/.bashrc
407
         echo '            if [ ${#SSH_ONION_HOSTNAME} -lt 2 ]; then' >> $rootdir/root/.bashrc
408
         echo '                exit 62392' >> $rootdir/root/.bashrc
408
         echo '                exit 62392' >> $rootdir/root/.bashrc
409
         echo '            fi' >> $rootdir/root/.bashrc
409
         echo '            fi' >> $rootdir/root/.bashrc
410
+        END_MESSAGE_HEIGHT=16
410
     else
411
     else
411
         END_MESSAGE2=$'\nYour system has now installed\n\nPress any key to reboot and begin using it'
412
         END_MESSAGE2=$'\nYour system has now installed\n\nPress any key to reboot and begin using it'
413
+        END_MESSAGE_HEIGHT=12
412
     fi
414
     fi
413
-    echo "            dialog --title '$END_MESSAGE1' --msgbox \"$END_MESSAGE2\" 12 50" >> $rootdir/root/.bashrc
415
+    echo "            dialog --title '$END_MESSAGE1' --msgbox \"$END_MESSAGE2\" ${END_MESSAGE_HEIGHT} 60" >> $rootdir/root/.bashrc
414
     echo '            reboot' >> $rootdir/root/.bashrc
416
     echo '            reboot' >> $rootdir/root/.bashrc
415
     echo '        fi' >> $rootdir/root/.bashrc
417
     echo '        fi' >> $rootdir/root/.bashrc
416
     echo '    else' >> $rootdir/root/.bashrc
418
     echo '    else' >> $rootdir/root/.bashrc