new update/upgrade script, ready for testing

Mykle1

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****/MagicMirror and try again?

sdetweil

@trividar yeh, he assumes MagicMirror is THE folder where things are installed…

gonzonia

Test runs fine…This is the result when I try to apply the log will be ```
code_text

No 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

sdetweil

@gonzonia yes, the upgrade script from the master github site has a bug,

please erase that one file

~/MagicMirror/installers/dumpactivemodules.js

and 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

evroom

@sdetweil

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 version

pi@MagicPi:~ $ git --version
git version 2.11.0

Any ideas ?

Best regards,
E.J.

sdetweil

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

evroom

@sdetweil

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.
Aborting

I can of course save and restore during the apply, but I do not know if this is what you want /expect.

sdetweil

@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.css

hmm… custom.css was taken out of distribution on the 2.9 release…
let me examine… hang on 30 mins

sdetweil

@sdetweil can u tell me what MM version you are running?

grep version ~/MagicMirror/package.json

thanks

evroom

@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.
Currently Downloading tmp-27972-0-electron-v3.1.13-linux-armv7l.zip which 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.