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 576.9k 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
      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
              • S Offline
                satsatt
                last edited by

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

                unalias git

                uh not ok

                pi@raspberrypi:~/MagicMirror $ alias git='LANGUAGE=en_US.UTF-8 git"
                > git status
                > unalias git
                > 
                
                
                S 1 Reply Last reply Reply Quote 0
                • S Offline
                  sdetweil @satsatt
                  last edited by

                  @satsatt sorry, bad paste

                  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
                  • S Offline
                    satsatt
                    last edited by

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

                    git status

                    pi@raspberrypi:~/MagicMirror $ git status
                    On branch master
                    Your branch is behind 'origin/master' by 2639 commits, and can be fast-forwarded.
                      (use "git pull" to update your local branch)
                    Changes to be committed:
                      (use "git reset HEAD <file>..." to unstage)
                    
                    	modified:   package-lock.json
                    	modified:   vendor/package-lock.json
                    
                    Untracked files:
                      (use "git add <file>..." to include in what will be committed)
                    
                    	installers/dumpactivemodules.js
                    
                    
                    
                    S 1 Reply Last reply Reply Quote 0
                    • S Offline
                      sdetweil @satsatt
                      last edited by

                      @satsatt great!.. thank you… can u try the update script again

                      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 $ bash -c “$(curl -sL https://www.dropbox.com/s/lxzwyzohg61sppu/upgrade-script.sh?dl=0)” apply
                        doing test run = false
                        update log will be in /home/pi/MagicMirror/installers/upgrade.log
                        saving custom.css
                        apply: Zeile 88: alias: git: Nicht gefunden.
                        upgrading from version 2.6.0 to 2.8.0
                        fetching latest revisions

                        error: Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge
                        überschrieben werden:
                        package-lock.json
                        vendor/package-lock.json
                        Bitte committen oder stashen Sie Ihre Änderungen, bevor sie mergen.
                        Abbruch
                        there were merge errors
                        you should examine and resolve them
                        using the command git log --oneline --decorate
                        de57daa (grafted, HEAD -> master, tag: v2.6.0) Merge pull request #1498 from MichMich/develop
                        restoring custom.css
                        apply: Zeile 256: [: ~=: Zweistelliger (binärer) Operator erwartet.

                        1 Reply Last reply Reply Quote 0
                        • 1
                        • 2
                        • 3
                        • 4
                        • 5
                        • 6
                        • 7
                        • 32
                        • 33
                        • 5 / 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