new update/upgrade script, ready for testing

[surger13]

i have tried the script now to upgrade MM to the new version. but nothing changes in the version.

in upgrade.log are the following errors:

test merge result rc='' , if empty, no conflicts
executing merge, apply specified
merge result rc= 1
 error: Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge überschrieben werden: 	css/custom.css 	package-lock.json 	vendor/package-lock.json Bitte committen oder stashen Sie Ihre Änderungen, bevor sie mergen. Abbruch Aktualisiere b508a62..b595cdd
there were merge errors
error: Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge überschrieben werden: 	css/custom.css 	package-lock.json 	vendor/package-lock.json Bitte committen oder stashen Sie Ihre Änderungen, bevor sie mergen. Abbruch Aktualisiere b508a62..b595cdd
you should examine and resolve them

[sdetweil]

@surger13 did u save the changed files when prompted?

what version are u on? 2.8?

do

grep version ~/MagicMirror/package.json

[surger13]

@sdetweil

pi@MagicMirrorPi:~/MagicMirror $ grep version ~/MagicMirror/package.json
  "version": "2.7.1",

[sdetweil]

@surger13 did u save the changed files when prompted?

can u show me the log , ~/MagicMirror/installers/upgrade.log

thx

[surger13]

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

did u save the changed files when prompted?

there was no request to save the files?!
I will send you the logfile by mail.

[evroom]

@sdetweil
Sam, the 2.9.0 threw an error on the electron update, but then continued.
I am apparently on 2.10.0 now, but probably I am not running the latest electron version.

pi@raspberrypi:~ $ grep version ~/MagicMirror/package.json
  "version": "2.10.0",

This was the part where the error occured:
:

:
> electron@3.1.13 postinstall /home/pi/MagicMirror/node_modules/electron
> node install.js

Downloading tmp-27972-0-electron-v3.1.13-linux-armv7l.zip
Error: read ECONNRESET
/home/pi/MagicMirror/node_modules/electron/install.js:49
  throw err
  ^

Error: read ECONNRESET
    at TLSWrap.onStreamRead (internal/stream_base_commons.js:111:27)
:
:

What would be the correct command to update electron and from which directory?

[sdetweil]

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

Error: read ECONNRESET

yeh, the website with the file broke the download…

u can try

cd ~/MagicMirror
npm install electron@3.0.13

[sdetweil]

@surger13 thanks for the log…

can u do

echo $LC_ALL
and
locale | grep LANGUAGE

thx

[surger13]

@sdetweil

both empty.

pi@MagicMirrorPi:~/MagicMirror $ echo $LC_ALL

pi@MagicMirrorPi:~/MagicMirror $ locale | grep LANGUAGE
LANGUAGE=

[sdetweil]

@surger13 weird, but the system is in german… so the message I was looking for the output of
git status, with the content of ‘modified’ in english

how about the output of

alias