From: Will Budicm <redacted>
Date: Sun, 30 Aug 2020 06:51:13 +0000 (+1000)
Subject: Merge branch '2.1.dev'
X-Git-Url: https://lifelog.hopto.org/gitweb/?a=commitdiff_plain;h=331d3bf2aee60b1f3cd2902213aa2e035e1c7031;p=LifeLog.git

Merge branch '2.1.dev'
---

331d3bf2aee60b1f3cd2902213aa2e035e1c7031
diff --cc install_modules.sh
index 0796346,9d47e5a..29f8271
--- a/install_modules.sh
+++ b/install_modules.sh
@@@ -8,20 -8,19 +8,18 @@@
  # Uncoment the  following git pull if also wanting to perform a latest pull
  # from the master (upgrade) repository.
  ## git pull
- 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
++
+ LIFELOG_MODS=install_lifelog_req_modules_2.0.sh
+ sudo cat Installation.txt | grep 'sudo apt install' > $LIFELOG_MODS
+ sudo cat Installation.txt | grep 'sudo cpan' >> $LIFELOG_MODS
+ sudo chmod +x $LIFELOG_MODS
  # The following is actual installation file generated. Don't run outside this script.
  # You can delete or keep after running this script.
- sudo ./$SCRIPT
+ sudo ./$LIFELOG_MODS
  
  #Used for stats, required utility
  sudo apt install inxi -y
  
--
--
  echo "\nDone with Life Log modules installation!\n"