From bc1eebb746742b1372dbd15498cea12db771abe6 Mon Sep 17 00:00:00 2001 From: PuZZleDucK Date: Sat, 20 Dec 2014 12:47:14 +1100 Subject: [PATCH 01/15] Expot log file name and re-export after username change. --- runme1st | 2 ++ 1 file changed, 2 insertions(+) diff --git a/runme1st b/runme1st index ebd7170..120c776 100755 --- a/runme1st +++ b/runme1st @@ -23,6 +23,7 @@ export UPDATE_LABEL="Updated_$(date +%F)" +export LOG_FILE="/home/$USER/$UPDATE_LABEL.log" setConfigOption() { CONFIG_FILE=/boot/config.txt @@ -289,6 +290,7 @@ cat <<'EOF' | sudo bash -s $USER $REPLY $HOME EOF USER=$REPLY + export LOG_FILE="/home/$USER/$UPDATE_LABEL.log" # renew logfile location echo "User name changed to $USER" else From 1c4b8143de50b9c0eff355b27628f443e8f4ff16 Mon Sep 17 00:00:00 2001 From: PuZZleDucK Date: Sat, 20 Dec 2014 13:05:57 +1100 Subject: [PATCH 02/15] Added Logging function. --- runme1st | 3 +++ 1 file changed, 3 insertions(+) diff --git a/runme1st b/runme1st index 120c776..171ecd5 100755 --- a/runme1st +++ b/runme1st @@ -24,6 +24,9 @@ export UPDATE_LABEL="Updated_$(date +%F)" export LOG_FILE="/home/$USER/$UPDATE_LABEL.log" +function eLog { # Echo & log input + echo "$1" | tee -a $LOG_FILE 2>&1 +} setConfigOption() { CONFIG_FILE=/boot/config.txt From 40e943e551cbd83b39e4a23adfcd21ae03d94889 Mon Sep 17 00:00:00 2001 From: PuZZleDucK Date: Sat, 20 Dec 2014 13:11:23 +1100 Subject: [PATCH 03/15] Added simple logs. --- runme1st | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/runme1st b/runme1st index 171ecd5..5167151 100755 --- a/runme1st +++ b/runme1st @@ -49,7 +49,7 @@ setOverclock() { # "Turbo ARM:1000MHz core:500MHz SDRAM:600MHz overvolt:6" ) - echo + eLog "" #CLOCKSETTINGS=$(echo --title "Over Clocking" --menu "Please select your clock settings from the following list. NB Turbo is NOT recommended " \ # $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT --cancel-button Back --ok-button Select \ @@ -67,7 +67,7 @@ setOverclock() { splitMemory() { REPLY=0 - echo N.B. For Minecraft 64Mb of Video Memory is recommended + eLog "N.B. For Minecraft 64Mb of Video Memory is recommended" while [[ ! $REPLY =~ (16|32|64|128|256) ]] ; do read -p "How much video memory do you want? (16|32|64|128|256) " -r < /dev/tty done @@ -205,10 +205,10 @@ sudo apt-get update # Make sure we using the lastest version of config script sudo apt-get install -y raspi-config -echo -echo I suggest removing the Wolframe engine as it\'s of limited use in IoT -echo projects. It will save about 1/2G of disk space and a *lot* of time -echo during upgrades +eLog "" +eLog "I suggest removing the Wolframe engine as it\'s of limited use in IoT" +eLog "projects. It will save about 1/2G of disk space and a *lot* of time" +eLog "during upgrades" if [[ $(ask "Do you wish to remove Wolframe engine? [y/N] ") =~ ^[Yy]$ ]] @@ -268,17 +268,17 @@ then sudo sed -ie 's/^\(..*\)'$oldhostname'\(.*\)$/\1'$REPLY'\2/' /etc/hosts else - echo + eLog "" fi # Rename the pi user account -echo -echo "You will now be offered to the chance to change the user name of the current user account" -echo "from $USER to something of your own choosing" -echo -echo "N.B. If this process fails you will probably have to re-image your SD card" -echo +eLog "" +eLog "You will now be offered to the chance to change the user name of the current user account" +eLog "from $USER to something of your own choosing" +eLog +eLog "N.B. If this process fails you will probably have to re-image your SD card" +eLog "" if [[ $(ask "Do you wish to rename the $USER user account?[y/N] ") =~ ^[Yy]$ ]] then @@ -295,16 +295,16 @@ EOF USER=$REPLY export LOG_FILE="/home/$USER/$UPDATE_LABEL.log" # renew logfile location - echo "User name changed to $USER" + eLog "User name changed to $USER" else - echo + eLog "" fi -echo If all has gone well you will be able to access this device using ssh $USER@$(cat /etc/hostname).local -echo assuming you have installed Avahi Zero Conf above +eLog "If all has gone well you will be able to access this device using ssh $USER@$(cat /etc/hostname).local" +eLog "assuming you have installed Avahi Zero Conf above" -echo Generally you now want to resize the default image size to occupy the whole of your SD card, -echo unless you want to archive this image for re-use later +eLog "Generally you now want to resize the default image size to occupy the whole of your SD card," +eLog "unless you want to archive this image for re-use later" if [[ ! $(ask "Do you wish to expand the file system to occupy the whole SD card?[Y/n] ") =~ ^[Nn]$ ]] then @@ -312,7 +312,7 @@ then sudo raspi-config --expand-rootfs fi -echo "System will now reboot. Afterwards please login as $USER and run the command" -echo "wget -O - http://tinyurl.com/RasPiIoT-2 | bash" +eLog "System will now reboot. Afterwards please login as $USER and run the command" +eLog "wget -O - http://tinyurl.com/RasPiIoT-2 | bash" read -p "Press any key to continue " -n 1 -r < /dev/tty sudo init 6 From 9707d829a0bed2bbd1eebcd80c0dc5c2aebaa922 Mon Sep 17 00:00:00 2001 From: PuZZleDucK Date: Sun, 21 Dec 2014 23:53:11 +1100 Subject: [PATCH 04/15] Added all non-intrusive logging --- runme1st | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/runme1st b/runme1st index 5167151..c1a69c7 100755 --- a/runme1st +++ b/runme1st @@ -28,6 +28,7 @@ function eLog { # Echo & log input echo "$1" | tee -a $LOG_FILE 2>&1 } +eLog "Logging CCHS update script: $LOG_FILE" setConfigOption() { CONFIG_FILE=/boot/config.txt if grep "$1=" $CONFIG_FILE ; then @@ -36,6 +37,7 @@ setConfigOption() { echo $1=$2' #'$UPDATE_LABEL| sudo tee -a $CONFIG_FILE fi } +eLog "Using config file: $CONFIG_FILE" export -f setConfigOption @@ -62,6 +64,7 @@ setOverclock() { xargs --no-run-if-empty -n 2 bash -c 'setConfigOption "$@"' {} break done < /dev/tty + eLog "Clock Settings: $clockSettings" } @@ -73,6 +76,7 @@ splitMemory() { done setConfigOption gpu_mem $REPLY + eLog "Video Memory: $REPLY" } @@ -90,6 +94,7 @@ calc_wt_size() { WT_WIDTH=120 fi WT_MENU_HEIGHT=$(($WT_HEIGHT-8)) + eLog "Wt Size: $WT_WIDTH x $WT_HEIGHT" } calc_wt_size @@ -97,7 +102,7 @@ calc_wt_size do_wifi() { # Written by @mikerr and stolen by @alecthegeek, see https://github.com/mikerr/raspi-config - +eLog "__ Wifi ___________________________________________________________" wifidevice=wlan0 WPAFILE=/etc/wpa_supplicant/wpa_supplicant.conf @@ -190,7 +195,9 @@ whiptail --msgbox "Wifi settings updated for SSID: $SSID" 20 60 1 # connect right now ? #wpa_supplicant -B -i$wifidevice -c $WPAFILE #dhclient $wifidevice -1 - +eLog "SSID: $SSID" +eLog "Encryption: $ENCRYPTION" +eLog "Wpa File: $WPAFILE" } @@ -200,11 +207,13 @@ ask() { } # Get updated package list +eLog "__ Apt-get ________________________________________________________" sudo apt-get update # Make sure we using the lastest version of config script sudo apt-get install -y raspi-config +eLog "__ Wolfram ________________________________________________________" eLog "" eLog "I suggest removing the Wolframe engine as it\'s of limited use in IoT" eLog "projects. It will save about 1/2G of disk space and a *lot* of time" @@ -215,17 +224,24 @@ if [[ $(ask "Do you wish to remove Wolframe engine? [y/N] ") =~ ^[Yy]$ ]] then #save 1/2G of space sudo apt-get -y purge wolfram-engine +else + eLog "Operation not performed." fi -echo Processing +eLog "__ Interactive Menus ______________________________________________" sudo dpkg-reconfigure locales +eLog "Interactive: Update locales." sudo dpkg-reconfigure tzdata -echo Processing +eLog "Interactive: Update time zone." sudo dpkg-reconfigure keyboard-configuration sudo invoke-rc.d keyboard-setup start +eLog "Interactive: Configure keyboard." splitMemory +eLog "Batch: Memory." setOverclock +eLog "Batch: Overclock." +eLog "__ Wifi ___________________________________________________________" if [[ $(ask "Do you wish to support WiFI? [y/N] ") =~ ^[Yy]$ ]] then @@ -238,18 +254,20 @@ then sudo ifup wlan0 fi else - echo + eLog "Operation not performed." fi +eLog "__ Zero Conf ______________________________________________________" if [[ $(ask "Do you wish to support Zero Conf Bonjour (recommended)? [y/N] ") =~ ^[Yy]$ ]] then sudo apt-get install -y avahi-daemon avahi-utils else - echo + eLog "Operation not performed." fi +eLog "__ Host Name ______________________________________________________" oldhostname=$(cat /etc/hostname) echo echo It is highly recommended that the hostname is changed to something unique on the network. @@ -266,12 +284,13 @@ then echo $REPLY | sudo tee /etc/hostname > /dev/null sudo sed -ie 's/^\(..*\)'$oldhostname'\(.*\)$/\1'$REPLY'\2/' /etc/hosts - + eLog "Hostname: $oldhostname -> $REPLY" else - eLog "" + eLog "Operation not performed." fi +eLog "__ User Name ______________________________________________________" # Rename the pi user account eLog "" eLog "You will now be offered to the chance to change the user name of the current user account" @@ -297,7 +316,7 @@ EOF eLog "User name changed to $USER" else - eLog "" + eLog "Operation not performed." fi eLog "If all has gone well you will be able to access this device using ssh $USER@$(cat /etc/hostname).local" @@ -306,6 +325,7 @@ eLog "assuming you have installed Avahi Zero Conf above" eLog "Generally you now want to resize the default image size to occupy the whole of your SD card," eLog "unless you want to archive this image for re-use later" +eLog "__ Expand FS ______________________________________________________" if [[ ! $(ask "Do you wish to expand the file system to occupy the whole SD card?[Y/n] ") =~ ^[Nn]$ ]] then #Expand the rootfs From 4bb2110002dc9db858a08c00372d8e5eecfe88bf Mon Sep 17 00:00:00 2001 From: PuZZleDucK Date: Mon, 22 Dec 2014 00:34:11 +1100 Subject: [PATCH 05/15] Added all non-intrusive logging to runme2nd --- runme2nd | 86 ++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 33 deletions(-) diff --git a/runme2nd b/runme2nd index 473e71f..258e65f 100755 --- a/runme2nd +++ b/runme2nd @@ -21,11 +21,14 @@ # # Special thanks to @mikered for wifi set up code - +export UPDATE_LABEL="Updated_$(date +%F)" +export LOG_FILE="/home/$USER/$UPDATE_LABEL.log" +function eLog { # Echo & log input + echo "$1" | tee -a $LOG_FILE 2>&1 +} # Add Check to encourage users to keep system up to date - - +eLog "__ Update Check____________________________________________________" echo 'APT::Update::Post-Invoke-Success {"touch /var/lib/apt/periodic/update-success-stamp 2>/dev/null || true";};' | \ sudo tee -a /etc/apt/apt.conf.d/15update-stamp > /dev/null @@ -43,10 +46,9 @@ echo ' echo Please run \"sudo apt-get update \&\& sudo apt-get -y upgrade\"' |\ echo fi | sudo tee -a /etc/profile.d/checkUpgrade.sh > /dev/null -echo -echo About to fully upgrade all relevant packages and optionally install others -echo This will take some time -echo +eLog "__ Updating _______________________________________________________" +eLog "About to fully upgrade all relevant packages and optionally install others" +eLog "This will take some time" # In case the upgrade does nothing create the masrker file @@ -60,6 +62,7 @@ ask() { echo $REPLY } +eLog "__ I2C & SPI ______________________________________________________" # Install and enable i2c and SPI sudo apt-get -y install i2c-tools lm-sensors python-smbus sudo sed /etc/modprobe.d/raspi-blacklist.conf \ @@ -68,16 +71,16 @@ sudo sed /etc/modprobe.d/raspi-blacklist.conf \ sudo adduser $USER i2c -echo Installed support for I2C serial interface and LM sensors -echo added $USER to the i2c group -echo +eLog "Installed support for I2C serial interface and LM sensors" +eLog "added $USER to the i2c group" -echo 'We will now install a few useful development tools (editors, source code control etc.)' +eLog "__ Dev Tools ______________________________________________________" +eLog "We will now install a few useful development tools (editors, source code control etc)." sudo apt-get -y install vim git git-gui git-doc git-svn subversion screen tmux ack-grep emacs locate python-setuptools sudo easy_install pip sudo pip install virtualenv virtualenvwrapper -echo +eLog "" cat < Date: Mon, 22 Dec 2014 01:00:30 +1100 Subject: [PATCH 06/15] Added execLog and begin testing on apt-get commands. --- runme1st | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/runme1st b/runme1st index c1a69c7..67cb8b0 100755 --- a/runme1st +++ b/runme1st @@ -27,6 +27,9 @@ export LOG_FILE="/home/$USER/$UPDATE_LABEL.log" function eLog { # Echo & log input echo "$1" | tee -a $LOG_FILE 2>&1 } +function execLog { # Execute & log output + $@ | tee -a $LOG_FILE 2>&1 +} eLog "Logging CCHS update script: $LOG_FILE" setConfigOption() { @@ -208,10 +211,10 @@ ask() { # Get updated package list eLog "__ Apt-get ________________________________________________________" -sudo apt-get update +execLog sudo apt-get update # Make sure we using the lastest version of config script -sudo apt-get install -y raspi-config +execLog sudo apt-get install -y raspi-config eLog "__ Wolfram ________________________________________________________" eLog "" @@ -223,7 +226,7 @@ eLog "during upgrades" if [[ $(ask "Do you wish to remove Wolframe engine? [y/N] ") =~ ^[Yy]$ ]] then #save 1/2G of space - sudo apt-get -y purge wolfram-engine + execLog sudo apt-get -y purge wolfram-engine else eLog "Operation not performed." fi @@ -245,7 +248,7 @@ eLog "__ Wifi ___________________________________________________________" if [[ $(ask "Do you wish to support WiFI? [y/N] ") =~ ^[Yy]$ ]] then - sudo apt-get install -y wpasupplicant + execLog sudo apt-get install -y wpasupplicant if [[ $(ask "Do you wish to configure a WiFI connection now? [y/N] ") =~ ^[Yy]$ ]] then do_wifi @@ -260,7 +263,7 @@ fi eLog "__ Zero Conf ______________________________________________________" if [[ $(ask "Do you wish to support Zero Conf Bonjour (recommended)? [y/N] ") =~ ^[Yy]$ ]] then - sudo apt-get install -y avahi-daemon avahi-utils + execLog sudo apt-get install -y avahi-daemon avahi-utils else eLog "Operation not performed." fi From e00f5b10afb0c723b46388446367cc1b2beec1b5 Mon Sep 17 00:00:00 2001 From: PuZZleDucK Date: Tue, 23 Dec 2014 07:47:57 +1100 Subject: [PATCH 07/15] Better spacing around user name change. --- runme1st | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runme1st b/runme1st index 67cb8b0..5744adf 100755 --- a/runme1st +++ b/runme1st @@ -298,7 +298,6 @@ eLog "__ User Name ______________________________________________________" eLog "" eLog "You will now be offered to the chance to change the user name of the current user account" eLog "from $USER to something of your own choosing" -eLog eLog "N.B. If this process fails you will probably have to re-image your SD card" eLog "" @@ -317,7 +316,8 @@ EOF USER=$REPLY export LOG_FILE="/home/$USER/$UPDATE_LABEL.log" # renew logfile location - eLog "User name changed to $USER" + eLog "User name changed to: $USER" + eLog "" else eLog "Operation not performed." fi From 8a852d0b9c260da7e818cbbefd30175171c4eee9 Mon Sep 17 00:00:00 2001 From: PuZZleDucK Date: Tue, 23 Dec 2014 07:49:10 +1100 Subject: [PATCH 08/15] Testing shutdown logging. --- runme1st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runme1st b/runme1st index 5744adf..eeee44c 100755 --- a/runme1st +++ b/runme1st @@ -338,4 +338,4 @@ fi eLog "System will now reboot. Afterwards please login as $USER and run the command" eLog "wget -O - http://tinyurl.com/RasPiIoT-2 | bash" read -p "Press any key to continue " -n 1 -r < /dev/tty -sudo init 6 +execLog sudo init 6 From a1588159118a298b3f6ea5bd0ce6331815baea14 Mon Sep 17 00:00:00 2001 From: PuZZleDucK Date: Tue, 23 Dec 2014 07:51:38 +1100 Subject: [PATCH 09/15] Fix script and logging file output. --- runme1st | 3 ++- runme2nd | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/runme1st b/runme1st index eeee44c..6bc88bc 100755 --- a/runme1st +++ b/runme1st @@ -31,7 +31,8 @@ function execLog { # Execute & log output $@ | tee -a $LOG_FILE 2>&1 } -eLog "Logging CCHS update script: $LOG_FILE" +eLog "CCHS update script: runme1st" +eLog "Logging to: $LOG_FILE" setConfigOption() { CONFIG_FILE=/boot/config.txt if grep "$1=" $CONFIG_FILE ; then diff --git a/runme2nd b/runme2nd index 258e65f..6af20fe 100755 --- a/runme2nd +++ b/runme2nd @@ -26,6 +26,8 @@ export LOG_FILE="/home/$USER/$UPDATE_LABEL.log" function eLog { # Echo & log input echo "$1" | tee -a $LOG_FILE 2>&1 } +eLog "CCHS update script: runme2nd" +eLog "Logging to: $LOG_FILE" # Add Check to encourage users to keep system up to date eLog "__ Update Check____________________________________________________" From 6dc419e891ac6e18fe7a97993d9eda2d4df194d9 Mon Sep 17 00:00:00 2001 From: PuZZleDucK Date: Tue, 23 Dec 2014 07:52:18 +1100 Subject: [PATCH 10/15] Add exec logging. --- runme2nd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/runme2nd b/runme2nd index 6af20fe..c0060ea 100755 --- a/runme2nd +++ b/runme2nd @@ -26,6 +26,9 @@ export LOG_FILE="/home/$USER/$UPDATE_LABEL.log" function eLog { # Echo & log input echo "$1" | tee -a $LOG_FILE 2>&1 } +function execLog { # Execute & log output + $@ | tee -a $LOG_FILE 2>&1 +} eLog "CCHS update script: runme2nd" eLog "Logging to: $LOG_FILE" From fe0a93653939d32f268a50f24e7f181fc276a7c6 Mon Sep 17 00:00:00 2001 From: PuZZleDucK Date: Tue, 23 Dec 2014 07:58:42 +1100 Subject: [PATCH 11/15] Add exec logging calls to 2nd. --- runme2nd | 82 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/runme2nd b/runme2nd index c0060ea..1245923 100755 --- a/runme2nd +++ b/runme2nd @@ -60,7 +60,7 @@ eLog "This will take some time" sudo touch /var/lib/apt/periodic/update-success-stamp # Make sure system is fully up to date -sudo apt-get -y dist-upgrade +execLog sudo apt-get -y dist-upgrade ask() { read -p "$1" -r < /dev/tty @@ -69,21 +69,21 @@ ask() { eLog "__ I2C & SPI ______________________________________________________" # Install and enable i2c and SPI -sudo apt-get -y install i2c-tools lm-sensors python-smbus +execLog sudo apt-get -y install i2c-tools lm-sensors python-smbus sudo sed /etc/modprobe.d/raspi-blacklist.conf \ -i -e 's/^#blacklist spi-bcm2708/blacklist spi-bcm2708/' \ -e 's/^#blacklist i2c-bcm2708/blacklist i2c-bcm2708/' -sudo adduser $USER i2c +execLog sudo adduser $USER i2c eLog "Installed support for I2C serial interface and LM sensors" eLog "added $USER to the i2c group" eLog "__ Dev Tools ______________________________________________________" eLog "We will now install a few useful development tools (editors, source code control etc)." -sudo apt-get -y install vim git git-gui git-doc git-svn subversion screen tmux ack-grep emacs locate python-setuptools -sudo easy_install pip -sudo pip install virtualenv virtualenvwrapper +execLog sudo apt-get -y install vim git git-gui git-doc git-svn subversion screen tmux ack-grep emacs locate python-setuptools +execLog sudo easy_install pip +execLog sudo pip install virtualenv virtualenvwrapper eLog "" @@ -126,7 +126,7 @@ eLog "__ Baracuda Copy Cloud ____________________________________________" eLog "The Baracuda Copy Cloud storage service works nativly on the Pi." if [[ $(ask "Do you wish to install and configure the Copy client? (http://copy.com/)[y/N] ") =~ ^[Yy]$ ]] then - bash <(wget --no-check-certificate -O - https://copy.com/YJYNOLByOoYpmgRy) + execLog bash <(wget --no-check-certificate -O - https://copy.com/YJYNOLByOoYpmgRy) eLog "Baracuda installed" else eLog "Operation not performed." @@ -135,7 +135,7 @@ fi eLog "__ Freetronics Pileven ____________________________________________" if [[ $(ask "Do you wish to install support for the Freetronics Pileven board?[y/N] ") =~ ^[Yy]$ ]] then - wget -O - https://github.com/freetronics/PiLeven-tools/releases/download/v1.0/install_pileven.sh | sudo bash + execLog wget -O - https://github.com/freetronics/PiLeven-tools/releases/download/v1.0/install_pileven.sh | sudo bash eLog "Pileven installed" else eLog "Operation not performed." @@ -154,8 +154,8 @@ then pushd $WP - git clone git://git.drogon.net/wiringPi . - ./build + execLog git clone git://git.drogon.net/wiringPi . + execLog ./build cat < Date: Wed, 24 Dec 2014 21:55:40 +1100 Subject: [PATCH 12/15] Removing logging of reboot, not working. --- runme2nd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runme2nd b/runme2nd index 1245923..1c0c8cf 100755 --- a/runme2nd +++ b/runme2nd @@ -311,4 +311,4 @@ eLog "Please use sudo raspi-config to configure additional options and" eLog "use sudo apt-get dist-upgrade on a regular basis" read -p "System will reboot in 5 seconds. Press any key to continue" -n 1 -r < /dev/tty -execLog nohup bash -c 'sleep 5; sudo shutdown -rF now'& # Force disk check +nohup bash -c 'sleep 5; sudo shutdown -rF now'& # Force disk check From a9994ede42ebd9b8590eddda401c48e2aa8a4a02 Mon Sep 17 00:00:00 2001 From: PuZZleDucK Date: Wed, 24 Dec 2014 21:58:36 +1100 Subject: [PATCH 13/15] Removing logging of copy cloud, can't test. --- runme2nd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runme2nd b/runme2nd index 1c0c8cf..888b844 100755 --- a/runme2nd +++ b/runme2nd @@ -126,7 +126,7 @@ eLog "__ Baracuda Copy Cloud ____________________________________________" eLog "The Baracuda Copy Cloud storage service works nativly on the Pi." if [[ $(ask "Do you wish to install and configure the Copy client? (http://copy.com/)[y/N] ") =~ ^[Yy]$ ]] then - execLog bash <(wget --no-check-certificate -O - https://copy.com/YJYNOLByOoYpmgRy) + bash <(wget --no-check-certificate -O - https://copy.com/YJYNOLByOoYpmgRy) eLog "Baracuda installed" else eLog "Operation not performed." From 5afe322c750a739aa4c0a358e493b2674f9f09f7 Mon Sep 17 00:00:00 2001 From: PuZZleDucK Date: Wed, 24 Dec 2014 22:05:42 +1100 Subject: [PATCH 14/15] Removing some of ROS logging, invalid characters in output. --- runme2nd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runme2nd b/runme2nd index 888b844..56e5060 100755 --- a/runme2nd +++ b/runme2nd @@ -184,7 +184,7 @@ if [[ $(ask "Do you wish to install the Robot OS? (http://ros.org)[y/N] ") =~ ^[ then # Add repo for Robot operating System echo "deb http://packages.ros.org/ros/ubuntu wheezy main" | sudo tee /etc/apt/sources.list.d/ros-latest.list - execLog wget https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -O - | sudo apt-key add - + wget https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -O - | sudo apt-key add - execLog sudo apt-get update # from http://wiki.ros.org/ROSberryPi/Installing%20ROS%20Indigo%20on%20Raspberry%20Pi#Installation From bab92cfb3ba7ad3eec16bf701c8b498fd003a329 Mon Sep 17 00:00:00 2001 From: PuZZleDucK Date: Sat, 27 Dec 2014 18:39:21 +1100 Subject: [PATCH 15/15] Small post-test fixes, logging correct overclock and moving text under correct header. --- runme1st | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runme1st b/runme1st index 6bc88bc..26c354b 100755 --- a/runme1st +++ b/runme1st @@ -68,7 +68,7 @@ setOverclock() { xargs --no-run-if-empty -n 2 bash -c 'setConfigOption "$@"' {} break done < /dev/tty - eLog "Clock Settings: $clockSettings" + eLog "Clock Settings: $c" } @@ -326,10 +326,10 @@ fi eLog "If all has gone well you will be able to access this device using ssh $USER@$(cat /etc/hostname).local" eLog "assuming you have installed Avahi Zero Conf above" +eLog "__ Expand FS ______________________________________________________" eLog "Generally you now want to resize the default image size to occupy the whole of your SD card," eLog "unless you want to archive this image for re-use later" -eLog "__ Expand FS ______________________________________________________" if [[ ! $(ask "Do you wish to expand the file system to occupy the whole SD card?[Y/n] ") =~ ^[Nn]$ ]] then #Expand the rootfs