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
    328 Posts 27 Posters 579.8k Views 24 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 @satsatt
      last edited by

      @satsatt can u post the contents of /home/pi/MagicMirror/installers/upgrade.log

      to stash, it is git stash

      but it should have prompted you to do that… so, please wait til I look thru the log

      Sam

      How to add modules

      learning how to use browser developers window for css changes

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

        @sdetweil ```
        Upgrade started - Sa Sep 14 09:01:30 CEST 2019
        doing test run = true
        downloading dumpactivemodules script
        saving custom.css
        remote name = origin
        upgrading from version 2.6.0 to 2.8.0
        fetching latest revisions
        current branch = master
        no files different from github version

        test merge result rc=‘’ if empty, no conflicts
        skipping merge, only test run
        processing dependency changes for active modules with package.json files
        processing for module MMM-SystemStats . please wait

        skipped processing for MMM-SystemStats, doing test run
        processing for module MMM-DWD-WarnWeather . please wait

        skipped processing for MMM-DWD-WarnWeather, doing test run
        restoring custom.css
        Upgrade ended - Sa Sep 14 09:01:33 CEST 2019

        Upgrade started - Sa Sep 14 09:02:16 CEST 2019
        user requested to apply changes
        doing test run = false
        saving custom.css
        remote name = origin
        upgrading from version 2.6.0 to 2.8.0
        fetching latest revisions
        current branch = master
        no files different from github version

        test merge result rc=‘’ if empty, no conflicts
        executing merge, apply specified
        merge result rc= 1 Aktualisiere de57daa…a31546b
        restoring custom.css
        Upgrade ended - Sa Sep 14 09:02:18 CEST 2019

        Upgrade started - Sa Sep 14 14:50:08 CEST 2019
        user requested to apply changes
        doing test run = false
        saving custom.css
        remote name = origin
        upgrading from version 2.6.0 to 2.8.0
        fetching latest revisions
        current branch = master
        no files different from github version

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

          @satsatt great thanks…

          can u show me the results of
          git status

          thanks

          Sam

          How to add modules

          learning how to use browser developers window for css changes

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

            @sdetweil ```
            pi@raspberrypi:~/MagicMirror $ git status
            Auf Branch master
            Ihr Branch ist zu ‘origin/master’ um 2639 Commits hinterher, und kann vorgespult werden.
            (benutzen Sie “git pull”, um Ihren lokalen Branch zu aktualisieren)
            zum Commit vorgemerkte Änderungen:
            (benutzen Sie “git reset HEAD …” zum Entfernen aus der Staging-Area)

            geändert:       package-lock.json
            geändert:       vendor/package-lock.json
            

            Unversionierte Dateien:
            (benutzen Sie “git add …”, um die Änderungen zum Commit vorzumerken)

            installers/dumpactivemodules.js
            
            S 1 Reply Last reply Reply Quote 0
            • S Offline
              sdetweil @satsatt
              last edited by

              @satsatt english word search…

              can u show me output of

              locale

              Sam

              How to add modules

              learning how to use browser developers window for css changes

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

                pi@raspberrypi:~/MagicMirror $ locale
                LANG=de_DE.UTF-8
                LANGUAGE=de_DE.UTF-8
                LC_CTYPE="de_DE.UTF-8"
                LC_NUMERIC="de_DE.UTF-8"
                LC_TIME="de_DE.UTF-8"
                LC_COLLATE="de_DE.UTF-8"
                LC_MONETARY="de_DE.UTF-8"
                LC_MESSAGES="de_DE.UTF-8"
                LC_PAPER="de_DE.UTF-8"
                LC_NAME="de_DE.UTF-8"
                LC_ADDRESS="de_DE.UTF-8"
                LC_TELEPHONE="de_DE.UTF-8"
                LC_MEASUREMENT="de_DE.UTF-8"
                LC_IDENTIFICATION="de_DE.UTF-8"
                LC_ALL=de_DE.UTF-8
                
                
                1 Reply Last reply Reply Quote 0
                • S Offline
                  satsatt
                  last edited by

                  you want git status in english i suppose?

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

                    @satsatt yes, working on that…

                    Sam

                    How to add modules

                    learning how to use browser developers window for css changes

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

                      I try
                      "your branch is regarding to origin/master 2639 commits back and can brought forward
                      use git pull to make your local branch actual

                      registered changes for Commit
                      ( use git reset for deleting from Staging-Area )

                      changed: package-lock.json
                      changed: vendor/package-lock.json

                      files not in version:
                      ( use git add for preparing files to commit )

                      installers/dumpactivemodules.js

                      "

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

                        @satsatt ok, was gonna ask for this

                        alias git='LANGUAGE=en_US.UTF-8 git"
                        git status
                        unalias git

                        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
                        • 4
                        • 5
                        • 32
                        • 33
                        • 2 / 33
                        • 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