Read the statement by Michael Teeuw here.
new update/upgrade script, ready for testing
-
Upgrade started - Sun Oct 6 11:26:51 +05 2019
user requested to apply changes
doing test run = falsesaving custom.css
remote name = origin
upgrading from version 2.8.0 to 2.9.0
fetching latest revisions
current branch = master
there are 7 local files that are different than the master repoinstallers/mm.sh
modules/default/calendar/calendar.js
modules/default/currentweather/currentweather.js
modules/default/weather/weather.js
modules/default/weatherforecast/weatherforecast.js
package-lock.json
run-start.shsave/restore files selection = y
test merge result rc=‘’ if empty, no conflicts
executing merge, apply specified
merge result rc= 0n Updating a31546b…500147e
updating MagicMirror runtime, please waitmagicmirror@2.8.0 install /home/pi/MagicMirror
cd vendor && npm install
npm WARN optional SKIPPING OPTIONAL DEPENDENCY: fsevents@1.2.4 (node_modules/fsevents):
npm WARN notsup SKIPPING OPTIONAL DEPENDENCY: Unsupported platform for fsevents@1.2.4: wanted {“os”:“darwin”,“arch”:“any”} (current: {“os”:“linux”,“arch”:“arm”})audited 220 packages in 53.517s
found 5 vulnerabilities (4 low, 1 high)
runnpm audit fixto fix them, ornpm auditfor detailsmagicmirror@2.8.0 postinstall /home/pi/MagicMirror
sh installers/postinstall/postinstall.sh && npm run install-fonts^[[32mMagicMirror installation successful!
magicmirror@2.8.0 install-fonts /home/pi/MagicMirror
cd fonts && npm installaudited 1 package in 3.78s
found 0 vulnerabilitiesnpm WARN grunt-stylelint@0.11.1 requires a peer of stylelint@^10.0.0 but none is installed. You must install peer dependencies yourself.
audited 3573 packages in 310.648sfound 16 vulnerabilities (1 moderate, 15 high)
run
npm audit fixto fix them, ornpm auditfor details
processing dependency changes for active modules with package.json files
processing for module MMM-WeeklySchedule please wait
audited 1 package in 3.297s
found 0 vulnerabilities
processing complete for module MMM-WeeklySchedule
processing for module MMM-MyPrayerTimes please wait
audited 3 packages in 4.211s
ound 0 vulnerabilities
processing complete for module MMM-MyPrayerTimes
restoring custom.css
we stashed a set of files that appear changed from the latest repo versions. you should review them -
This post is deleted! -
@bobwilliams do a git pull, and show the results…
looks like git lied on the return code of the merge…
merge result rc= 0n Updating a31546b…500147elets try the output of this
git merge-tree `git merge-base master HEAD` HEAD masterthanks
-
no change … I’m a simple user so don’t judge strictly
-
@bobwilliams no judging… my script should help with this
just gotta understand it…
the output of those two commands is the same?cd ~/MagicMirror git merge-tree `git merge-base master HEAD` HEAD master then git pull -
@sdetweil said in new update/upgrade script, ready for testing:
git pull
pi@raspberrypi:~ $ cd ~/MagicMirror
pi@raspberrypi:~/MagicMirror $ git merge-treegit merge-base master HEADHEAD master
pi@raspberrypi:~/MagicMirror $ git pull
Updating a31546b…500147e
error: Your local changes to the following files would be overwritten by merge:
modules/default/currentweather/currentweather.js
modules/default/weather/weather.js
modules/default/weatherforecast/weatherforecast.js
package-lock.json
run-start.sh
Please commit your changes or stash them before you merge.
Aborting
pi@raspberrypi:~/MagicMirror $ -
@bobwilliams said in new update/upgrade script, ready for testing:
git merge-tree git merge-base master HEAD HEAD master
there were two little backtics (left of 1 on us keyboard)
replace backtic in the next command with that keyboard charactergit merge-tree backtic git merge-base master HEAD backtic HEAD mastergit pull results hm… we did a stash, why are those files still listed
try some more
git stash show git stash git pull -
pi@raspberrypi:~/MagicMirror $ git merge-tree ~ git merge-base master HEAD ~ HEAD master
usage: git merge-tree
pi@raspberrypi:~/MagicMirror $ git stash show
No stash entries found.
pi@raspberrypi:~/MagicMirror $ git stash*** Please tell me who you are.
Run
git config --global user.email “you@example.com”
git config --global user.name “Your Name”to set your account’s default identity.
Omit --global to set the identity only in this repository.fatal: unable to auto-detect email address (got ‘pi@raspberrypi.(none)’)
Cannot save the current index state
pi@raspberrypi:~/MagicMirror $ git pull
Updating a31546b…500147e
error: Your local changes to the following files would be overwritten by merge:
modules/default/currentweather/currentweather.js
modules/default/weather/weather.js
modules/default/weatherforecast/weatherforecast.js
package-lock.json
run-start.sh
Please commit your changes or stash them before you merge.
Aborting
pi@raspberrypi:~/MagicMirror $ -
@bobwilliams great!!.. let me see what I can do about that…
also ~ git , that is the tilde character, i need the single quote leaning to the left (backtic), same keyboard key for me, just not with shift
-
@bobwilliams lets try this
git -c user.name=upgrade_script -c user.email=script@upgrade.com stash then git stash show -
@sdetweil English is not my native language … sorry but I did not quite understand what to do
-
@bobwilliams no problems… no need to apologize… we will work thru it…
ps, I can’t speak ANYTHING in your language.
-
pi@raspberrypi:~/MagicMirror $ git -c user.name=upgrade_script -c user.email=script@upgrade.com stash
Saved working directory and index state WIP on master: a31546b Merge pull request #1717 from MichMich/develop
pi@raspberrypi:~/MagicMirror $ git stash show
installers/mm.sh | 2 ±
modules/default/calendar/calendar.js | 4 ±
modules/default/currentweather/currentweather.js | 2 ±
modules/default/weather/weather.js | 2 ±
modules/default/weatherforecast/weatherforecast.js | 2 ±
package-lock.json | 799 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++±-------------------------------------------------
run-start.sh | 4 ±
7 files changed, 442 insertions(+), 373 deletions(-) -
@bobwilliams cool… then try this
git status git -c user.name=upgrade_script -c user.email=script@upgrade.com stash pop git status -
pi@raspberrypi:~/MagicMirror $ git status
On branch master
Your branch is behind ‘origin/master’ by 2715 commits, and can be fast-forwarded.
(use “git pull” to update your local branch)Untracked files:
(use “git add …” to include in what will be committed)$ 0 installers/dumpactivemodules.js installers/mm_temp.sh installers/pm2_MagicMirror_new.json installers/startMagicMirror.sh installers/stashed_files xdotool.shnothing added to commit but untracked files present (use “git add” to track)
pi@raspberrypi:~/MagicMirror $ git -c user.name=upgrade_script -c user.email=script@upgrade.com stash pop
On branch master
Your branch is behind ‘origin/master’ by 2715 commits, and can be fast-forwarded.
(use “git pull” to update your local branch)Changes not staged for commit:
(use “git add …” to update what will be committed)
(use “git checkout – …” to discard changes in working directory)modified: installers/mm.sh modified: modules/default/calendar/calendar.js modified: modules/default/currentweather/currentweather.js modified: modules/default/weather/weather.js modified: modules/default/weatherforecast/weatherforecast.js modified: package-lock.json modified: run-start.shUntracked files:
(use “git add …” to include in what will be committed)$ 0 installers/dumpactivemodules.js installers/mm_temp.sh installers/pm2_MagicMirror_new.json installers/startMagicMirror.sh installers/stashed_files xdotool.shno changes added to commit (use “git add” and/or “git commit -a”)
Dropped refs/stash@{0} (83cd0d8b2b4ace83bbebb79d03b3d7456a861583)
pi@raspberrypi:~/MagicMirror $ git status
On branch master
Your branch is behind ‘origin/master’ by 2715 commits, and can be fast-forwarded.
(use “git pull” to update your local branch)Changes not staged for commit:
(use “git add …” to update what will be committed)
(use “git checkout – …” to discard changes in working directory)modified: installers/mm.sh modified: modules/default/calendar/calendar.js modified: modules/default/currentweather/currentweather.js modified: modules/default/weather/weather.js modified: modules/default/weatherforecast/weatherforecast.js modified: package-lock.json modified: run-start.shUntracked files:
(use “git add …” to include in what will be committed)$ 0 installers/dumpactivemodules.js installers/mm_temp.sh installers/pm2_MagicMirror_new.json installers/startMagicMirror.sh installers/stashed_files xdotool.shno changes added to commit (use “git add” and/or “git commit -a”)
pi@raspberrypi:~/MagicMirror $ -
@bobwilliams fabulous!!
so the ‘problem’ was that there were modified files found…
you asked to save them, but the save command (stash) failed, because it needed some additional info
so the files weren’t merged, and then we reinstalled the currently downloaded version (2.8.0)
I didn’t detect that, i do nowso, when u have time, please retry the upgrade script.
bash -c "$(curl -sL https://www.dropbox.com/s/lxzwyzohg61sppu/upgrade-script.sh?dl=0)" apply -
thanks, I’ll try now
-
a lot of mistakes and the mirror stopped showing
-
@bobwilliams can u send me the log ? same userid as here on gmail
-
where to send? here does not let me write writes that spam
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