Read the statement by Michael Teeuw here.
Updating 6db61b4..de57daa
-
@dazza120 The error I’m getting is from the ‘git pull’ command while in the correct directory.
-
@icephreaq post the error you are getting
-
@dazza120 The title of this thread is literally what I get when I enter ‘git pull’ from within ~/MagicMirror I get no other messages or output. Just Updating 6db61b4…de57daa and then back to my prompt.
-
This is what you should be seeing:
pi@mirror-pi:~/MagicMirror $ git pull Updating 6db61b4..de57daa Fast-forward CHANGELOG.md | 37 + README.md | 4 +- config/config.js.sample | 4 +- modules/default/calendar/README.md | 7 +- modules/default/calendar/calendar.js | 121 +- modules/default/calendar/calendarfetcher.js | 10 +- modules/default/calendar/vendor/ical.js/node-ical.js | 8 +- modules/default/clock/README.md | 5 + modules/default/clock/clock_screenshot.png | Bin 0 -> 30525 bytes modules/default/compliments/README.md | 36 +- modules/default/compliments/compliments_screenshot.png | Bin 0 -> 26157 bytes modules/default/currentweather/README.md | 7 +- modules/default/currentweather/weather_screenshot.png | Bin 0 -> 38566 bytes modules/default/defaultmodules.js | 3 +- modules/default/newsfeed/README.md | 4 + modules/default/newsfeed/newsfeed.js | 2 +- modules/default/newsfeed/newsfeed_screenshot.png | Bin 0 -> 45375 bytes modules/default/weather/README.md | 98 ++ modules/default/weather/current.njk | 68 + modules/default/weather/current.png | Bin 0 -> 8141 bytes modules/default/weather/forecast.njk | 26 + modules/default/weather/forecast.png | Bin 0 -> 16385 bytes modules/default/weather/providers/README.md | 129 ++ modules/default/weather/providers/darksky.js | 113 ++ modules/default/weather/providers/openweathermap.js | 165 +++ modules/default/weather/weather.css | 45 + modules/default/weather/weather.js | 212 +++ modules/default/weather/weatherobject.js | 100 ++ modules/default/weather/weatherprovider.js | 154 +++ modules/default/weatherforecast/README.md | 12 +- modules/default/weatherforecast/forecast_screenshot.png | Bin 0 -> 86206 bytes modules/default/weatherforecast/weatherforecast.js | 6 +- package-lock.json | 2253 ++++++++++++++++--------------- package.json | 16 +- translations/hr.json | 35 + translations/pl.json | 2 +- translations/pt.json | 10 +- translations/ro.json | 4 +- translations/translations.js | 3 +- vendor/package-lock.json | 558 ++------ vendor/package.json | 1 + vendor/vendor.js | 2 + vendor/yarn.lock | 178 +++ 43 files changed, 2836 insertions(+), 1602 deletions(-) create mode 100644 modules/default/clock/clock_screenshot.png create mode 100644 modules/default/compliments/compliments_screenshot.png create mode 100644 modules/default/currentweather/weather_screenshot.png create mode 100644 modules/default/newsfeed/newsfeed_screenshot.png create mode 100644 modules/default/weather/README.md create mode 100644 modules/default/weather/current.njk create mode 100644 modules/default/weather/current.png create mode 100644 modules/default/weather/forecast.njk create mode 100644 modules/default/weather/forecast.png create mode 100644 modules/default/weather/providers/README.md create mode 100644 modules/default/weather/providers/darksky.js create mode 100644 modules/default/weather/providers/openweathermap.js create mode 100644 modules/default/weather/weather.css create mode 100644 modules/default/weather/weather.js create mode 100644 modules/default/weather/weatherobject.js create mode 100644 modules/default/weather/weatherprovider.js create mode 100644 modules/default/weatherforecast/forecast_screenshot.png create mode 100644 translations/hr.jsonI would double check that you have a live internet connection from your Pi. Also… be patient. It does take a few seconds for the Pi to reach out and download the code. I would break the commands out separately as well.
git pullfrom the MagicMirror directory, followed bynpm installafterwards. Let us know how it goes. -
@icephreaq What is
git statustelling you? -
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. Abortingand i dont know what to do…
-
@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.
-
@costascontis You can just delete both
package-lock.jsonfiles. Everything will work after you have deleted them. -
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 -
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! HahahaAnd below that it found 9 vulnerabilities. Is that a problem?
-
@mwel1977 even the calendar as mine is up the swannie
-
@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? -
@mwel1977 said in Updating 6db61b4..de57daa:
the swannie
swannie river
up the river…
http://www.musicanet.org/robokopp/usa/waydownu.htm -
@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 👌🏾
-
@mwel1977 The vulnerabilities needs to be fixed by the module developer. Thats not your responsibility, you can just ignore them.
Because of the Node.js version: You don’t have to update to a newer version of Node.js. Latest isn’t always the greatest, there are some known compatibility issues with v11.
-
this one helped me:
-
I renamed the old folder and did a fresh installation. Half an hour of work if you use the old config and css.
-
I do have an active internet connection. I typically admin my mirror through SSH from a separate Linux machine and I’m able to connect to the mirror and update other items without issue. git status gives the following.
On branch master Your branch is behind 'origin/master' by 124 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: fonts/package-lock.json modified: package-lock.json modified: package.json modified: vendor/package-lock.json Untracked files: (use "git add <file>..." to include in what will be committed) core nohup.out no changes added to commit (use "git add" and/or "git commit -a") -
@icephreaq - Give this a try:
cd ~/MagicMirror git stash git pull npm installAlso, @costascontis - You shouldn’t run the git commands as sudo. You may end up screwing up your permissions on the files pulled down from git.
-
I ended up removing all instances of package-lock.json and ran git pull and was able to successfully update. Thanks for everyone’s input on this!
Hello! It looks like you're interested in this conversation, but you don't have an account yet.
Getting fed up of having to scroll through the same posts each visit? When you register for an account, you'll always come back to exactly where you were before, and choose to be notified of new replies (either via email, or push notification). You'll also be able to save bookmarks and upvote posts to show your appreciation to other community members.
With your input, this post could be even better 💗
Register Login