new update/upgrade script, ready for testing

Mykle1

@sdetweil

Understood. :thumbsup:

bobwilliams

for some reason, it updates me to version 2.8.0, although it seems like version 2.9.0 has already been released.

MagicMirror installation successful!

magicmirror@2.8.0 install-fonts /home/pi/MagicMirror
cd fonts && npm install

sdetweil

@bobwilliams can you show me the MagicMirror/installers/upgrade.log

or send it to me mail, same userid as here on gmail, thanks

bobwilliams

Upgrade started - Sun Oct 6 11:26:51 +05 2019
user requested to apply changes
doing test run = false

saving 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 repo

installers/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.sh

save/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 wait

magicmirror@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)
run npm audit fix to fix them, or npm audit for details

magicmirror@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 install

audited 1 package in 3.78s
found 0 vulnerabilities

npm 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.648s

found 16 vulnerabilities (1 moderate, 15 high)

run npm audit fix to fix them, or npm audit for 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

sdetweil

This post is deleted!

sdetweil

@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…500147e

lets try the output of this

git merge-tree `git merge-base master HEAD` HEAD master

thanks

bobwilliams

no change … I’m a simple user so don’t judge strictly

sdetweil

@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

bobwilliams

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

git pull

pi@raspberrypi:~ $ cd ~/MagicMirror
pi@raspberrypi:~/MagicMirror $ git merge-tree git merge-base master HEAD HEAD 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 $

sdetweil

@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 character

 git merge-tree backtic git merge-base master HEAD backtic HEAD master

git pull results hm… we did a stash, why are those files still listed

try some more

git stash show
git stash 
git pull