Read the statement by Michael Teeuw here.
new update/upgrade script, ready for testing
-
this is what I get:
> cd - >/dev/null > date +"Upgrade ended - %a %b %e %H:%M:%S %Z %Y" >>$logfile > else > echo It appears MagicMirror has not been installed on this system > echo please run the installer, "raspberry.sh" first > fiCan it be because my path has the same folder name twice? /Users/s****/MagicMirror/MagicMirror
-
Hmm, perhaps. The installer may be looking for the MM installation inside /Users/s****/MagicMirror. Can you move the MagicMirror folder with the installation OUT of the containing MagicMirror folder. Rename the containing MagicMirror folder to something else and put the MagicMirror folder containing the MM installation here
/Users/s****/MagicMirrorand try again? -
@trividar yeh, he assumes MagicMirror is THE folder where things are installed…
-
Test runs fine…This is the result when I try to apply the log will be ```
code_textNo LSB modules are available. doing test run = false update log will be in /home/pi/MagicMirror/installers/upgrade.log saving custom.css upgrading from version 2.9.0 to 2.10.0 fetching latest revisions there were merge errors error: The following untracked working tree files would be overwritten by merge: installers/dumpactivemodules.js Please move or remove them before you merge. Aborting Updating 500147e..b595cdd you should examine and resolve them using the command git log --oneline --decorate 500147e (grafted, HEAD -> master, tag: v2.9.0) Merge pull request #1776 from MichMich/develop restoring custom.css -
@gonzonia yes, the upgrade script from the master github site has a bug,
please erase that one file
~/MagicMirror/installers/dumpactivemodules.jsand then use the link to the script from this topic page1
https://forum.magicmirror.builders/topic/10859/new-update-upgrade-script-ready-for-testing?page=1
-
Hi Sam, updating MM to 2.10.0 using your script. At the end the test run says:
any *-lock.json files do not need to be saved do you want to save these files for later (Y/n)?Y git: 'git_user_name' is not a git command. See 'git --help'. no modules found needing npm refresh restoring custom.css test run, restoring files stashed git: 'git_user_name' is not a git command. See 'git --help'.The upgrade.log file does not give a clue as to what exact command was used.
I am not into git, so cannot give you anything more than the git versionpi@MagicPi:~ $ git --version git version 2.11.0Any ideas ?
Best regards,
E.J. -
@evroom great find!..
give it another try please…
git wants all operations to be tagged with the users email address and name.
but if you haven’t provided one, I use a temporary approach… -
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.
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