MagicMirror Forum
    • Recent
    • Tags
    • Unsolved
    • Solved
    • MagicMirror² Repository
    • Documentation
    • 3rd-Party-Modules
    • Donate
    • Discord
    • Register
    • Login
    A New Chapter for MagicMirror: The Community Takes the Lead
    Read the statement by Michael Teeuw here.

    Updating 6db61b4..de57daa

    Scheduled Pinned Locked Moved Solved Troubleshooting
    26 Posts 9 Posters 10.4k Views 9 Watching
    Loading More Posts
    • Oldest to Newest
    • Newest to Oldest
    • Most Votes
    Reply
    • Reply as topic
    Log in to reply
    This topic has been deleted. Only users with topic management privileges can see it.
    • bheplerB Offline
      bhepler Module Developer
      last edited by

      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.

      1 Reply Last reply Reply Quote 0
      • idoodlerI Offline
        idoodler Module Developer @icephreaq
        last edited by

        @icephreaq What is git status telling you?

        1 Reply Last reply Reply Quote 0
        • C Offline
          costascontis
          last edited by

          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…

          D idoodlerI 2 Replies Last reply Reply Quote 0
          • D Offline
            dazza120 @costascontis
            last edited by

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

            1 Reply Last reply Reply Quote 0
            • idoodlerI Offline
              idoodler Module Developer @costascontis
              last edited by

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

              M 1 Reply Last reply Reply Quote 0
              • M Offline
                MWel1977 @idoodler
                last edited by

                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

                M 1 Reply Last reply Reply Quote 0
                • M Offline
                  MWel1977 @MWel1977
                  last edited by

                  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?

                  D idoodlerI 2 Replies Last reply Reply Quote 0
                  • D Offline
                    dazza120 @MWel1977
                    last edited by

                    @mwel1977 even the calendar as mine is up the swannie

                    M 1 Reply Last reply Reply Quote 0
                    • M Offline
                      MWel1977 @dazza120
                      last edited by

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

                      D 1 Reply Last reply Reply Quote 0
                      • S Offline
                        sdetweil
                        last edited by

                        @mwel1977 said in Updating 6db61b4..de57daa:

                        the swannie

                        swannie river

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

                        Sam

                        How to add modules

                        learning how to use browser developers window for css changes

                        1 Reply Last reply Reply Quote 0
                        • 1
                        • 2
                        • 3
                        • 1 / 3
                        • First post
                          Last post
                        Enjoying MagicMirror? Please consider a donation!
                        MagicMirror created by Michael Teeuw.
                        Forum managed by Sam, technical setup by Karsten.
                        This forum is using NodeBB as its core | Contributors
                        Contact | Privacy Policy