From cb7ccd78543c1288332a32ab9709c79701a748fc Mon Sep 17 00:00:00 2001 From: Sam Detweiler Date: Fri, 25 Oct 2019 08:46:41 -0500 Subject: [PATCH] update readme and upgrade script to work from website, fix tabs in config sample --- README.md | 4 ++-- config/config.js.sample | 8 ++++---- installers/upgrade-script.sh | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 329c00df..0cf5e831 100644 --- a/README.md +++ b/README.md @@ -178,13 +178,13 @@ For more available modules, check out out the wiki page [MagicMirror² 3rd Party If you want to update your MagicMirror² to the latest version, use your terminal to go to your Magic Mirror folder and type the following command: ``` -installers/upgrade-script.sh +bash -c "$(curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/master/installers/upgrade-script.sh)" ``` This will do a test run If the test update looks good then run this command ``` -installers/upgrade-script.sh apply +bash -c "$(curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/master/installers/upgrade-script.sh)" apply ``` If there are changes you have made, they will be listed, and u will have the opportunity to save your work diff --git a/config/config.js.sample b/config/config.js.sample index 0e5ff840..115e2dd2 100644 --- a/config/config.js.sample +++ b/config/config.js.sample @@ -25,10 +25,10 @@ var config = { timeFormat: 24, units: "metric", // serverOnly: true/false/"local" , - // local for armv6l processors, default - // starts serveronly and then starts chrome browser - // false, default for all NON-armv6l devices - // true, force serveronly mode, because you want to.. no UI on this device + // local for armv6l processors, default + // starts serveronly and then starts chrome browser + // false, default for all NON-armv6l devices + // true, force serveronly mode, because you want to.. no UI on this device modules: [ { diff --git a/installers/upgrade-script.sh b/installers/upgrade-script.sh index 9dd5d76f..88fea656 100755 --- a/installers/upgrade-script.sh +++ b/installers/upgrade-script.sh @@ -78,12 +78,12 @@ if [ -d ~/MagicMirror ]; then fi # if we want just the modules listed in config.js now - #if [ $justActive == $true ]; then - # if [ ! -f ~/MagicMirror/installers/dumpactivemodules.js ]; then - # echo downloading dumpactivemodules script >> $logfile - # curl -sL https://www.dropbox.com/s/wwe6bfg2lcjmj43/dumpactivemodules.js?dl=0 > ~/MagicMirror/installers/dumpactivemodules.js - # fi - #fi + if [ $justActive == $true ]; then + if [ ! -f ~/MagicMirror/installers/dumpactivemodules.js ]; then + echo downloading dumpactivemodules script >> $logfile + curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/develop/installers/dumpactivemodules.js > ~/MagicMirror/installers/dumpactivemodules.js + fi + fi echo update log will be in $logfile # used for parsing the array of module names SAVEIFS=$IFS # Save current IFS