• Recent
  • Tags
  • Unsolved
  • Solved
  • MagicMirror² Repository
  • Documentation
  • 3rd-Party-Modules
  • Donate
  • Discord
  • Register
  • Login
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.

new update/upgrade script, ready for testing

Scheduled Pinned Locked Moved General Discussion
325 Posts 26 Posters 496.4k Views 23 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.
  • S Offline
    sdetweil @evroom
    last edited by Jan 3, 2020, 12:54 PM

    @evroom said in new update/upgrade script, ready for testing:

    error: Your local changes to the following files would be overwritten by merge:
    css/custom.css

    hmm… custom.css was taken out of distribution on the 2.9 release…
    let me examine… hang on 30 mins

    Sam

    How to add modules

    learning how to use browser developers window for css changes

    S 1 Reply Last reply Jan 3, 2020, 1:31 PM Reply Quote 0
    • S Offline
      sdetweil @sdetweil
      last edited by Jan 3, 2020, 1:31 PM

      @sdetweil can u tell me what MM version you are running?

      grep version ~/MagicMirror/package.json
      

      thanks

      Sam

      How to add modules

      learning how to use browser developers window for css changes

      1 Reply Last reply Reply Quote 0
      • E Offline
        evroom
        last edited by Jan 3, 2020, 2:01 PM

        @sdetweil said in new update/upgrade script, ready for testing:

        grep version ~/MagicMirror/package.json

        This MM install has

        pi@MagicPi:~ $ grep version ~/MagicMirror/package.json
          "version": "2.8.0",
        

        Apparently I did not upgrade to 2.9.0. :-)

        In parallel I am upgrading an 2.9.0 install (using the ‘old’ apply script). I got the same git: 'git_user_name' is not a git command.error there, but decided to do the apply anyway.
        Currently Downloading tmp-27972-0-electron-v3.1.13-linux-armv7l.zip which takes forever for some reason (approx. 700 B/s).

        Btw, I know it can be solved by other means, but I would like you to be able to tweak your script.

        MagicMirror version: 2.30.0
        Raspberry Pi 4 Model B Rev 1.5 (8 GB RAM)
        Raspbian GNU/Linux 12 (bookworm)

        Test environment:
        MagicMirror version: v2.30.0
        Raspberry Pi 3 Model B Plus Rev 1.3 (1 GB RAM)
        Raspbian GNU/Linux 12 (bookworm)

        S 1 Reply Last reply Jan 3, 2020, 2:14 PM Reply Quote 0
        • G Offline
          gonzonia @sdetweil
          last edited by Jan 3, 2020, 2:04 PM

          @sdetweil Thanks! I thought I’d tried that as well. Guess not. All good now!

          1 Reply Last reply Reply Quote 0
          • S Offline
            sdetweil @evroom
            last edited by Jan 3, 2020, 2:14 PM

            @evroom >In parallel I am upgrading an 2.9.0 install (using the ‘old’ apply script).

            old? I updated the dropbox file so, it should have been fixed…

            the install script is now part of the base.

            “version”: “2.8.0”,

            actually the upgrade log should have said, upgrading from 2.8 to 2.10,
            also shown on the screen

            the upgrade.log is located in the MagicMirror/installers folder

            Sam

            How to add modules

            learning how to use browser developers window for css changes

            1 Reply Last reply Reply Quote 0
            • E Offline
              evroom
              last edited by Jan 3, 2020, 2:36 PM

              @sdetweil said in new update/upgrade script, ready for testing:

              old? I updated the dropbox file so, it should have been fixed…

              I mean before you said “give it another try please…”.
              Old is always relative :-)

              The upgrade log did say```
              upgrading from version 2.8.0 to 2.10.0

              The upgrade that I still running says```
              upgrading from version 2.9.0 to 2.10.0
              

              The test run on the 2.8.0 install currently outputs this:

              pi@MagicPi:~ $ date; bash -c  "$(curl -sL https://www.dropbox.com/s/lxzwyzohg61sppu/upgrade-script.sh?dl=0)"
              Fri Jan  3 15:34:42 CET 2020
              the log will be /home/pi/MagicMirror/installers/upgrade.log
              No LSB modules are available.
              doing test run = true
              update log will be in /home/pi/MagicMirror/installers/upgrade.log
              
              saving custom.css
              upgrading from version 2.8.0 to 2.10.0
              fetching latest revisions
              there are 1 local files that are different than the master repo
              
                 css/custom.css
              
              do you want to save these files for later   (Y/n)?Y
              processing dependency changes for active modules with package.json files
              
              processing for module MMM-PublicTransportHafas please wait
              ----------------------------------
              skipped processing for MMM-PublicTransportHafas, doing test run
              processing complete for module MMM-PublicTransportHafas
              
              processing for module MMM-soccer please wait
              ----------------------------------
              skipped processing for MMM-soccer, doing test run
              processing complete for module MMM-soccer
              
              restoring custom.css
              test run, restoring files stashed
              error: Your local changes to the following files would be overwritten by merge:
              	css/custom.css
              Please commit your changes or stash them before you merge.
              Aborting
              

              MagicMirror version: 2.30.0
              Raspberry Pi 4 Model B Rev 1.5 (8 GB RAM)
              Raspbian GNU/Linux 12 (bookworm)

              Test environment:
              MagicMirror version: v2.30.0
              Raspberry Pi 3 Model B Plus Rev 1.3 (1 GB RAM)
              Raspbian GNU/Linux 12 (bookworm)

              S 1 Reply Last reply Jan 3, 2020, 2:42 PM Reply Quote 0
              • S Offline
                sdetweil @evroom
                last edited by Jan 3, 2020, 2:42 PM

                @evroom yeh, thats because of the test run against 2.8

                on apply this will be fixed…

                Sam

                How to add modules

                learning how to use browser developers window for css changes

                1 Reply Last reply Reply Quote 0
                • S Offline
                  surger13 Project Sponsor
                  last edited by Jan 3, 2020, 3:50 PM

                  i have tried the script now to upgrade MM to the new version. but nothing changes in the version.

                  in upgrade.log are the following errors:

                  test merge result rc='' , if empty, no conflicts
                  executing merge, apply specified
                  merge result rc= 1
                   error: Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge überschrieben werden: 	css/custom.css 	package-lock.json 	vendor/package-lock.json Bitte committen oder stashen Sie Ihre Änderungen, bevor sie mergen. Abbruch Aktualisiere b508a62..b595cdd
                  there were merge errors
                  error: Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge überschrieben werden: 	css/custom.css 	package-lock.json 	vendor/package-lock.json Bitte committen oder stashen Sie Ihre Änderungen, bevor sie mergen. Abbruch Aktualisiere b508a62..b595cdd
                  you should examine and resolve them
                  
                  
                  S 1 Reply Last reply Jan 3, 2020, 3:51 PM Reply Quote 0
                  • S Offline
                    sdetweil @surger13
                    last edited by Jan 3, 2020, 3:51 PM

                    @surger13 did u save the changed files when prompted?

                    what version are u on? 2.8?

                    do

                    grep version ~/MagicMirror/package.json
                    

                    Sam

                    How to add modules

                    learning how to use browser developers window for css changes

                    S 1 Reply Last reply Jan 3, 2020, 3:53 PM Reply Quote 0
                    • S Offline
                      surger13 Project Sponsor @sdetweil
                      last edited by Jan 3, 2020, 3:53 PM

                      @sdetweil

                      pi@MagicMirrorPi:~/MagicMirror $ grep version ~/MagicMirror/package.json
                        "version": "2.7.1",
                      
                      
                      S 1 Reply Last reply Jan 3, 2020, 3:55 PM Reply Quote 0
                      • 1
                      • 2
                      • 17
                      • 18
                      • 19
                      • 20
                      • 21
                      • 32
                      • 33
                      • 19 / 33
                      19 / 33
                      • First post
                        189/325
                        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