Update MMM

minomit

Some problem:

git pull

Updating 5bf90ae…447c0bf
error: Your local changes to the following files would be overwritten by merge:
modules/default/compliments/compliments.js
package-lock.json
Please commit your changes or stash them before you merge.
Aborting

help me please, thanks

sdetweil

@jims said in Update MMM:

local version 2.11.0 already same as master 2.11.0

if at the same level u have to use ‘force’ as ‘apply’ will stop if the same level

pi@raspberrypi:~ $ npm start

always start MM from the ~/MagicMirror folder, not the users home folder

minomit

no update from version 2.10.1 to 2.11.0
in the folder:

pi@raspberrypi:~/MagicMirror $ bash -c “$(curl -sL https://raw.githubusercontent.com/sdetweil/MagicMirror_scripts/master/upgrade-script.sh)”
bash: warning: setlocale: LC_ALL: cannot change locale (it_IT)
the log will be /home/pi/MagicMirror/installers/upgrade.log
No LSB modules are available.
doing test run = true
update log will be in /home/pi/MagicMirror/installers/upgrade.log

upgrading from version 2.10.1 to 2.11.0
fetching latest revisions
bash: line 396: warning: setlocale: LC_ALL: cannot change locale (it_IT)
bash: line 396: warning: setlocale: LC_ALL: cannot change locale (it_IT)
there are 2 local files that are different than the master repo

modules/default/compliments/compliments.js
package-lock.json

any *-lock.json files do not need to be saved
do you want to save these files for later (Y/n)?n
skipping restore for modules/default/compliments/compliments.js, doing test run
skipping restore for package-lock.json, doing test run
processing dependency changes for active modules with package.json files

processing for module MMM-network-signal please wait

skipped processing for MMM-network-signal, doing test run
processing complete for module MMM-network-signal

processing for module MMM-GooglePhotos please wait

skipped processing for MMM-GooglePhotos, doing test run
processing complete for module MMM-GooglePhotos

processing for module MMM-COVID19-SPARKLINE please wait

skipped processing for MMM-COVID19-SPARKLINE, doing test run
processing complete for module MMM-COVID19-SPARKLINE

processing for module MMM-NowPlayingOnSpotify please wait

skipped processing for MMM-NowPlayingOnSpotify, doing test run
processing complete for module MMM-NowPlayingOnSpotify

processing for module MMM-AlexaControl please wait

skipped processing for MMM-AlexaControl, doing test run
processing complete for module MMM-AlexaControl

sdetweil

@minomit said in Update MMM:

doing test run = true

upgrade-script.sh will do the git pull and npm install, and refresh npm setup for any modules that might need it
it should handle all the work… and give you a trial run of all that…

only applying changes if u request them

give it a try this works on Mac as well

bash -c "$(curl -sL https://raw.githubusercontent.com/sdetweil/MagicMirror_scripts/master/upgrade-script.sh)"
no changes are made to the local repo or the working copy

**if you WANT to actually apply the changes do**

bash -c "$(curl -sL https://raw.githubusercontent.com/sdetweil/MagicMirror_scripts/master/upgrade-script.sh)" apply
there is a log file (upgrade.log) in the MagicMirror/installers folder…

I built it to TEST first… and not just blindly apply… give u a chance to figure out what to do…

sdetweil

@minomit

notice it highlights a file u might want to look out for

modules/default/compliments/compliments.js

did u change this? if so, your changes might be lost

minomit

@sdetweil yes, I tried to put the original file too, same problem

sdetweil

@minomit which ‘same problem’

if u want the original file back

cd ~/MagicMirror
git checkout modules/default/compliments/compliments.js

did u do this

bash -c "$(curl -sL https://raw.githubusercontent.com/sdetweil/MagicMirror_scripts/master/upgrade-script.sh)" apply

minomit

ok ok, perfect thanks

Zinkeler

Hello,
after update “npm run start” works, but how can i stop MM ? “npm run stop” did not work.
Thx

sdetweil

@Zinkeler typically is npm start, then ctrl-c will stop it… if you use pm2, them pm2 start 0, and pm2 stop 0