Updating 6db61b4..de57daa

[idoodler]

@icephreaq What is git status telling you?

[costascontis]

i also get an error from git pull:

pi@magicmirror:~/MagicMirror $ sudo git pull && npm install
Updating 6db61b4..de57daa
error: Your local changes to the following files would be overwritten by merge:
	package-lock.json
	vendor/package-lock.json
Please commit your changes or stash them before you merge.
Aborting

and i dont know what to do…

[dazza120]

@costascontis rename them and the git pull will make a new version of them, but be warned I’m not sure if that’s why calendar just displays loading when it was working on previous but don’t think so as all the other modules work.

[idoodler]

@costascontis You can just delete both package-lock.jsonfiles. Everything will work after you have deleted them.

[MWel1977]

I have the same problem as @costascontis and will try to delete that file.
But I also would like to know what the latest version of Node.js is.
At https://github.com/nodesource/distributions#debinstall I can see a version 11.x.
my version on the pi 3B+ is v9.11.2
Is that the latest version or must I update to v11.x via:
sudo su
curl -sL https://deb.nodesource.com/setup_11.x | bash -
apt-get install -y nodejs

[MWel1977]

Just moved the package-lock.js to a new folder “Old files” and run “sudo git pull && npm install” again and it worked for me.
I do get some warnings from “time-grunt@2.0.0” and 2 from npm skipping optional dependency’s but below that it reads: MagicMirror installation succesfull! NICE!.. well…that last word isn’t part of the update! Hahaha

And below that it found 9 vulnerabilities. Is that a problem?

[dazza120]

@mwel1977 even the calendar as mine is up the swannie

[MWel1977]

@dazza120 I’m not using the standard calendar.
But after the update my MM2 works like before. Only the modules I’m working on are still not showing correctly…becouse I’m working on them to get them to work properly. :smiling_face_with_open_mouth_cold_sweat: :smiling_face_with_open_mouth_cold_sweat:
But what do you mean with: “…is up the swannie”?
you mean it doesn’t work?

[sdetweil]

@mwel1977 said in Updating 6db61b4..de57daa:

the swannie

swannie river

up the river…
http://www.musicanet.org/robokopp/usa/waydownu.htm

[dazza120]

@mwel1977 yep UK local slang, anyway I’ve sorted it now I downloaded the Magic Mirror from github on the Pi, unzipped it and then copied the whole folder to the module default location and over wrote everything, it was missing a lot of files for some reason. Anyway enough said it’s working like it should now 👌🏾