new update/upgrade script, ready for testing

Mykle1

@sdetweil

Where is it saved to? I can’t seem to find it in Home or the MagicMirror dir

sdetweil

@Mykle1 in the installers folder… (where the install script is and where the upgrade and pm2 scripts should go

dang it… u mean you didn’t READ the message the script put out about where the log is? lol…

Mykle1

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

u mean you didn’t READ the message the script put out about where the log is? lol…

uhhhh . . . real men don’t read messages. ;-)

Sent the file to your gmail

bhepler

@sdetweil - Hmm. Curious. Test run of the script looked good. Added the apply keyword and I’m getting a git error.

any *-lock.json files do not need to be saved
do you want to save these files for later   (Y/n)?n
fatal: Unable to create '/home/pi/MagicMirror/.git/index.lock': File exists.

Another git process seems to be running in this repository, e.g.
an editor opened by 'git commit'. Please make sure all processes
are terminated then try again. If it still fails, a git process
may have crashed in this repository earlier:
remove the file manually to continue.

there were merge errors
you should examine and resolve them
using the command git log --oneline --decorate
a31546b (HEAD -> master, tag: v2.8.0) Merge pull request #1717 from MichMich/develop

Then a bunch of commit statements. There is no git process running at the moment, but that index.lock file does exist. After deleting that file, it worked like a charm. Thanks!

sdetweil

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

but that index.lock file does exist

to git that means it is already running… on exit it cleans up…

should I add handling this error to the script?
I can tell if its there and git is not running.

great feedback… thanks

sdetweil

@bhepler i added handling for the git lock file…

if git is NOT running, I erase the dangling lock file
if git IS running, and this is an APPLY run, i change the run back to test mode, and advise to correct the problem

Mykle1

I just did another run of your upgrade script, Sam. All went well.

MM 2.8.0 --> 2.9.0
Ubuntu 16.04.6 (downgraded from 18.04)

sdetweil

@Mykle1 on the 1st run, no modules were updated… there should have been a message in the log… i didn’t see it… did u see any this time??

Mykle1

@sdetweil

Sorry, I was distracted here, Sam. I just emailed you the upgrade.log

sdetweil

@Mykle1 thanks… they(last night and today) actually look good
i did make one change, the merge results generated one LONE line… i added some formatting to make it readable

sdetweil

@Mykle1 well, there is installed modules, and there is active modules…

i only update the ACTIVE (ie, not disabled: true) modules with package.json files

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 $