From: Will Budicm <redacted>
Date: Fri, 31 Jul 2020 22:28:17 +0000 (+1000)
Subject: Merge branch 'master' into 2.0.dev
X-Git-Url: https://lifelog.hopto.org/gitweb/?a=commitdiff_plain;h=9b7acd4d6fd1f3dcc669765c014fba4dc96ab396;p=LifeLog.git

Merge branch 'master' into 2.0.dev
---

9b7acd4d6fd1f3dcc669765c014fba4dc96ab396
diff --cc install_modules.sh
index 24f7f9b,02e940d..0796346
--- a/install_modules.sh
+++ b/install_modules.sh
@@@ -8,15 -8,18 +8,20 @@@
  # Uncoment the  following git pull if also wanting to perform a latest pull
  # from the master (upgrade) repository.
  ## git pull
 -sudo cat Installation.txt | grep 'sudo apt install' > install_lifelog_modules_1.1.8.sh
 -sudo cat Installation.txt | grep 'sudo cpan' >> install_lifelog_modules_1.1.8.sh
 -sudo chmod +x install_lifelog_modules_1.1.8.sh
 +VER="2.0"
 +SCRIPT="install_lifelog_modules_$VER.sh"
 +sudo cat Installation.txt | grep 'sudo apt install' > $SCRIPT
 +sudo cat Installation.txt | grep 'sudo cpan' >> $SCRIPT
 +sudo chmod +x $SCRIPT
  # The following is actual installation file generated. Don't run outside this script.
  # You can delete or keep after running this script.
 -sudo ./install_lifelog_modules_1.1.8.sh
 +sudo ./$SCRIPT
  
+ #Used for stats, required utility
+ sudo apt install inxi -y
+ 
+ 
+ 
  echo "\nDone with Life Log modules installation!\n"