From cf9e60ad47e19f876370b7ed141847db93cd5d31 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 19 Oct 2016 21:10:07 +0100 Subject: [PATCH] Simplify --- src/freedombone-image-customise | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index c5e42a10..ed549212 100755 --- a/src/freedombone-image-customise +++ b/src/freedombone-image-customise @@ -392,14 +392,12 @@ EOF echo " if [ -f ~/${PROJECT_NAME}-completed.txt ]; then" >> $rootdir/root/.bashrc # Remove the initial setup files echo ' rm /root/.initial_setup' >> $rootdir/root/.bashrc - echo " MY_USERNAME=${MY_USERNAME}" >> $rootdir/root/.bashrc - echo " SSH_PORT=${SSH_PORT}" >> $rootdir/root/.bashrc - echo ' rm /home/${MY_USERNAME}/.initial_setup' >> $rootdir/root/.bashrc + echo ' rm /home/fbone/.initial_setup' >> $rootdir/root/.bashrc echo " touch /root/.remove_${GENERIC_IMAGE_USERNAME}" >> $rootdir/root/.bashrc echo ' shred -zu ~/login.txt' >> $rootdir/root/.bashrc END_MESSAGE1=$'Congratulations!' if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "usb" ]]; then - 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' + END_MESSAGE2=$'\nYour system has now installed\n\nThe onion ssh service is at:\n\n ${SSH_ONION_HOSTNAME}\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' echo ' SSH_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_ssh/hostname)' >> $rootdir/root/.bashrc echo ' if [ ${#SSH_ONION_HOSTNAME} -lt 2 ]; then' >> $rootdir/root/.bashrc