Read the statement by Michael Teeuw here.
new update/upgrade script, ready for testing
-
@potts-mike also, try again… fixed a messaging problem
but… you have MM already installed… (if the folder exists, cause the log is put there)…
so, you should be using the update-script to bring to next version… -
@sdetweil Can You help me please with this, running Your script gives me this
doing test run = false update log will be in /home/pi/MagicMirror/installers/upgrade.log saving custom.css 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 ->
how do i commit or stash?
-
@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
-
@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 versiontest 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 waitskipped processing for MMM-SystemStats, doing test run
processing for module MMM-DWD-WarnWeather . please waitskipped processing for MMM-DWD-WarnWeather, doing test run
restoring custom.css
Upgrade ended - Sa Sep 14 09:01:33 CEST 2019Upgrade 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 versiontest 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 2019Upgrade 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 -
-
@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
-
-
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
-
you want git status in english i suppose?
-
@satsatt yes, working on that…