v2.1.1 Update Error

lucallmon

Tried to run the update and this is what I got:

pi@raspberrypi:~ $ cd MagicMirror
pi@raspberrypi:~/MagicMirror $ git pull && npm install
Updating 8010e62..1a2b4f8
error: Your local changes to the following files would be overwritten by merge:
	modules/default/clock/clock.js
	modules/default/compliments/compliments.js
Please, commit your changes or stash them before you can merge.
Aborting
pi@raspberrypi:~/MagicMirror $

It completely aborts. Not sure what to do.

strawberry 3.141

@lucallmon this is because you changed those mentioned files manually. If you want to revert your changes permamently do git checkout modules/default/clock/clock.js modules/default/compliments/compliments.js and rerun your command

ostfilinchen

Hi all,

I get an error during loading says m.loaded is not a function. Is there an workaround?

Regards
Daniel

ostfilinchen

Hi all,

i found the module that gives me the error. It’s the MMM-PIR-Sensor module. The error says, that electron has the wrong abi-version: Expected 49, got 53.

What can i do to fix it? I have remove the node_modules Folder in MM\modules\MMM-PIR-Sensor and install it again. But the error is still the same.

Daniel

strawberry 3.141

@ostfilinchen you have to rebuild like @yawns mentioned here https://forum.magicmirror.builders/topic/948/error-found-error-module-version-mismatch-expected-50-got-46

bluecaka69

@strawberry-3.141 said in v2.1.1 Update Error:

@lucallmon this is because you changed those mentioned files manually. If you want to revert your changes permamently do git checkout modules/default/clock/clock.js modules/default/compliments/compliments.js and rerun your command

I got this for compliments as well if info what you mentioned will it keep everything the same?? I had a heck of a time getting it to work I don’t want to loose anything

strawberry 3.141

@bluecaka69 with my command you will loose your changes you can copy the files to a backup directory first

bluecaka69

@strawberry-3.141 so just make a copy of the config file. Run your command, then git pull && npm install. The transfer over my saved config??

strawberry 3.141

@bluecaka69 no those files which get complaint about modifications but you can save your config as well

yawns

@bluecaka69
No, not the config file. You changed things in clock.js and compliments.js and therefore git pull cannot update these files to be exactly like the updates ones in the repository.