Merge pull request #182 from CDuffers/logging

Enhancement to log init.sh and main.sh install scripts from issue #64

docs/install-scripts.md

@@ -4,9 +4,9 @@ All these links, link to the `stable` branch.
 
 The installation process is broken out into separate scripts that can be run individually.
 
-**[init.sh:](https://github.com/openenergymonitor/EmonScripts/blob/stable/install/init.sh)** Launches the full installation script, first downloading the EmonScripts repository that contains the rest of the installation scripts.
+**[init.sh:](https://github.com/openenergymonitor/EmonScripts/blob/stable/install/init.sh)** Launches the full installation script, first downloading the EmonScripts repository that contains the rest of the installation scripts. All output sent to screen also stored in the user's home directory `~/init.sh.log`.
 
-**[main.sh:](https://github.com/openenergymonitor/EmonScripts/blob/stable/install/main.sh)** Loads the configuration file and runs the individual installation scripts as applicable.
+**[main.sh:](https://github.com/openenergymonitor/EmonScripts/blob/stable/install/main.sh)** Loads the configuration file and runs the individual installation scripts as applicable. All output sent to screen also stored in the user's home directory `~/main.sh.log`.
 
 ---
 

docs/install.md

@@ -41,6 +41,8 @@ chmod +x init.sh && ./init.sh
 
 The `init` script automatically calls the `main` script. At this point you will be offered the option to configure the installation process.
 
+Output from `init.sh` is displayed on screen and also stored in the user's home directory `~/init.sh.log`. Output from `main.sh` is also displayed on screen and stored in the user's home directory `~/main.sh.log`.
+
 If you are on a RaspberryPi or EmonPi you can usually just proceed.
 
 Be patient, the install process takes some time.

install/init.sh

@@ -1,5 +1,14 @@
 #!/bin/bash
 
+# Copy stdout and stderr to a log file in addition to the console
+# tee -a used in case script is run multiple times
+
+LOG_FILE=~/$(basename "$0").log
+exec > >(tee -a "${LOG_FILE}") 2>&1
+
+echo "Script output also stored in ${LOG_FILE}"
+echo -e "Started: $(date)\n"
+
 user=$USER
 openenergymonitor_dir=/opt/openenergymonitor
 emoncms_dir=/opt/emoncms
@@ -24,3 +33,5 @@ cd $openenergymonitor_dir/EmonScripts/install
 cd
 
 rm init.sh
+
+echo -e "\nScript output also stored in ${LOG_FILE}"

install/main.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 # --------------------------------------------------------------------------------
 # RaspberryPi Strech Build Script
 # Emoncms, Emoncms Modules, EmonHub & dependencies
@@ -13,12 +14,20 @@
 # - emonhub installer
 # Format as documentation
 
+# Copy stdout and stderr to a log file in addition to the console
+# tee -a used in case script is run multiple times
+
+LOG_FILE=~/$(basename "$0").log
+exec > >(tee -a "${LOG_FILE}") 2>&1
+
+echo "Script output also stored in ${LOG_FILE}"
+echo -e "Started: $(date)\n"
+
 # fix interactive popup that keeps asking for service restart
 if [ -f /etc/needrestart/needrestart.conf ]; then
   sudo sed -i 's/#$nrconf{restart} = '"'"'i'"'"';/$nrconf{restart} = '"'"'a'"'"';/g' /etc/needrestart/needrestart.conf
 fi
 
-#!/bin/bash
 if [ ! -f config.ini ]; then
     cp emonsd.config.ini config.ini
 fi
@@ -100,13 +109,8 @@ if [ "$emonSD_pi_env" = "1" ]; then
     # update checks for image type and only runs with a valid image name file in the boot partition
     # Update this value to the latest safe image version - this could be automated to pull from safe list
     sudo touch /boot/emonSD-10Nov22
-    exit 0
-    # Reboot to complete
-    sudo reboot
 else
     $openenergymonitor_dir/EmonScripts/install/non_emonsd.sh;
-    # sudo touch /boot/emonSD-30Oct18
-    exit 0
-    # Reboot to complete
-    sudo reboot
 fi
+
+echo -e "\nScript output also stored in ${LOG_FILE}"