update readme and upgrade script to work from website, fix tabs in config sample

This commit is contained in:
Sam Detweiler 2019-10-25 08:46:41 -05:00
parent 269c429959
commit cb7ccd7854
3 changed files with 12 additions and 12 deletions

View File

@ -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: 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 This will do a test run
If the test update looks good then run this command 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 If there are changes you have made, they will be listed, and u will have the opportunity to save your work

View File

@ -25,10 +25,10 @@ var config = {
timeFormat: 24, timeFormat: 24,
units: "metric", units: "metric",
// serverOnly: true/false/"local" , // serverOnly: true/false/"local" ,
// local for armv6l processors, default // local for armv6l processors, default
// starts serveronly and then starts chrome browser // starts serveronly and then starts chrome browser
// false, default for all NON-armv6l devices // false, default for all NON-armv6l devices
// true, force serveronly mode, because you want to.. no UI on this device // true, force serveronly mode, because you want to.. no UI on this device
modules: [ modules: [
{ {

View File

@ -78,12 +78,12 @@ if [ -d ~/MagicMirror ]; then
fi fi
# if we want just the modules listed in config.js now # if we want just the modules listed in config.js now
#if [ $justActive == $true ]; then if [ $justActive == $true ]; then
# if [ ! -f ~/MagicMirror/installers/dumpactivemodules.js ]; then if [ ! -f ~/MagicMirror/installers/dumpactivemodules.js ]; then
# echo downloading dumpactivemodules script >> $logfile echo downloading dumpactivemodules script >> $logfile
# curl -sL https://www.dropbox.com/s/wwe6bfg2lcjmj43/dumpactivemodules.js?dl=0 > ~/MagicMirror/installers/dumpactivemodules.js curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/develop/installers/dumpactivemodules.js > ~/MagicMirror/installers/dumpactivemodules.js
# fi fi
#fi fi
echo update log will be in $logfile echo update log will be in $logfile
# used for parsing the array of module names # used for parsing the array of module names
SAVEIFS=$IFS # Save current IFS SAVEIFS=$IFS # Save current IFS