new update/upgrade script, ready for testing

[gonzonia]

@sdetweil Thanks! I thought I’d tried that as well. Guess not. All good now!

[sdetweil]

@evroom >In parallel I am upgrading an 2.9.0 install (using the ‘old’ apply script).

old? I updated the dropbox file so, it should have been fixed…

the install script is now part of the base.

“version”: “2.8.0”,

actually the upgrade log should have said, upgrading from 2.8 to 2.10,
also shown on the screen

the upgrade.log is located in the MagicMirror/installers folder

[evroom]

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

old? I updated the dropbox file so, it should have been fixed…

I mean before you said “give it another try please…”.
Old is always relative :-)

The upgrade log did say```
upgrading from version 2.8.0 to 2.10.0

The upgrade that I still running says```
upgrading from version 2.9.0 to 2.10.0

The test run on the 2.8.0 install currently outputs this:

pi@MagicPi:~ $ date; bash -c  "$(curl -sL https://www.dropbox.com/s/lxzwyzohg61sppu/upgrade-script.sh?dl=0)"
Fri Jan  3 15:34:42 CET 2020
the log will be /home/pi/MagicMirror/installers/upgrade.log
No LSB modules are available.
doing test run = true
update log will be in /home/pi/MagicMirror/installers/upgrade.log

saving custom.css
upgrading from version 2.8.0 to 2.10.0
fetching latest revisions
there are 1 local files that are different than the master repo

   css/custom.css

do you want to save these files for later   (Y/n)?Y
processing dependency changes for active modules with package.json files

processing for module MMM-PublicTransportHafas please wait
----------------------------------
skipped processing for MMM-PublicTransportHafas, doing test run
processing complete for module MMM-PublicTransportHafas

processing for module MMM-soccer please wait
----------------------------------
skipped processing for MMM-soccer, doing test run
processing complete for module MMM-soccer

restoring custom.css
test run, restoring files stashed
error: Your local changes to the following files would be overwritten by merge:
	css/custom.css
Please commit your changes or stash them before you merge.
Aborting

[sdetweil]

@evroom yeh, thats because of the test run against 2.8

on apply this will be fixed…

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