Read the statement by Michael Teeuw here.
new update/upgrade script, ready for testing
-
Latest run:
: : here 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 : : 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. AbortingI can of course save and restore during the apply, but I do not know if this is what you want /expect.
-
@evroom said in new update/upgrade script, ready for testing:
error: Your local changes to the following files would be overwritten by merge:
css/custom.csshmm… custom.css was taken out of distribution on the 2.9 release…
let me examine… hang on 30 mins -
@sdetweil can u tell me what MM version you are running?
grep version ~/MagicMirror/package.jsonthanks
-
@sdetweil said in new update/upgrade script, ready for testing:
grep version ~/MagicMirror/package.json
This MM install has
pi@MagicPi:~ $ grep version ~/MagicMirror/package.json "version": "2.8.0",Apparently I did not upgrade to 2.9.0. :-)
In parallel I am upgrading an 2.9.0 install (using the ‘old’ apply script). I got the same
git: 'git_user_name' is not a git command.error there, but decided to do the apply anyway.
CurrentlyDownloading tmp-27972-0-electron-v3.1.13-linux-armv7l.zipwhich takes forever for some reason (approx. 700 B/s).Btw, I know it can be solved by other means, but I would like you to be able to tweak your script.
-
@sdetweil Thanks! I thought I’d tried that as well. Guess not. All good now!
-
@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 screenthe upgrade.log is located in the MagicMirror/installers folder
-
@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.0The upgrade that I still running says``` upgrading from version 2.9.0 to 2.10.0The 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 -
@evroom yeh, thats because of the test run against 2.8
on apply this will be fixed…
-
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 -
@surger13 did u save the changed files when prompted?
what version are u on? 2.8?
do
grep version ~/MagicMirror/package.json -
pi@MagicMirrorPi:~/MagicMirror $ grep version ~/MagicMirror/package.json "version": "2.7.1", -
@surger13 did u save the changed files when prompted?
can u show me the log , ~/MagicMirror/installers/upgrade.log
thx
-
@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. -
@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?
-
@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 -
-
both empty.
pi@MagicMirrorPi:~/MagicMirror $ echo $LC_ALL pi@MagicMirrorPi:~/MagicMirror $ locale | grep LANGUAGE LANGUAGE= -
@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 englishhow about the output of
alias
-
yes the language is german.
pi@MagicMirrorPi:~/MagicMirror $ alias alias egrep='egrep --color=auto' alias fgrep='fgrep --color=auto' alias grep='grep --color=auto' alias ls='ls --color=auto' -
Hello! It looks like you're interested in this conversation, but you don't have an account yet.
Getting fed up of having to scroll through the same posts each visit? When you register for an account, you'll always come back to exactly where you were before, and choose to be notified of new replies (either via email, or push notification). You'll also be able to save bookmarks and upvote posts to show your appreciation to other community members.
With your input, this post could be even better 💗
Register Login