new update/upgrade script, ready for testing

[satsatt]

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

[sdetweil]

@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

[satsatt]

@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

[sdetweil]

@satsatt great thanks…

can u show me the results of
git status

thanks

[satsatt]

@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

[sdetweil]

@satsatt english word search…

can u show me output of

locale

[satsatt]

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

[satsatt]

you want git status in english i suppose?

[sdetweil]

@satsatt yes, working on that…

[satsatt]

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

"

[sdetweil]

@satsatt ok, was gonna ask for this

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

[satsatt]

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

[sdetweil]

@satsatt sorry, bad paste

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

[satsatt]

@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

[sdetweil]

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

[satsatt]

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.

[satsatt]

sorry need to be away from terminal for 10h - thank’s alot

[sdetweil]

@satsatt ok, when u have time , try the script again… thanks SO much for your help

[BKeyport]

Love this concept - question though - from what I’ve read (bits and pieces admittedly), it looks like it only handles the main software - could this be expanded to traverse your module directories and update them, so it could be run, say nightly, to check for and apply updates to everything?

[rabbit83ka]

Hi, great work! I Just used the script to update to 2.9.0 - the only thing I had to do manually was a

git reset --hard

before running the script (and afterwards restoring my backup of custom.css).