Updating 6db61b4..de57daa

icephreaq

I’m trying to update to 2.6.0 and the base OS is fully up to date. Running “git pull && npm install” gets me this message “Updating 6db61b4…de57daa” and nothing ever updates. I’ve run npm update -g as well to make sure that everything is fully up to date there. Any idea what I’m missing?

dazza120

@icephreaq no cd MagicMirror then run git pull and the npm install

icephreaq

@dazza120 The error I’m getting is from the ‘git pull’ command while in the correct directory.

dazza120

@icephreaq post the error you are getting

icephreaq

@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.

bhepler

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.json

I 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 pull from the MagicMirror directory, followed by npm install afterwards. Let us know how it goes.

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.

SOLVED Updating 6db61b4..de57daa