new update/upgrade script, ready for testing

[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