Cant update from 2.9.0 > 2.10.0 using update script

HarryBerry

Hi,
today I was looking at my mirror and saw I had to update, so I tried to use MichMich’s update script

bash -c "$(curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/master/installers/upgrade-script.sh)" apply

I got this Error

the log will be /home/pi/MagicMirror/installers/upgrade.log
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

Then I did

sudo rm -f ~/MagicMirror/installers/dumpactivemodules.js

Tried again and got the same error above

then I tried @sdetweil update script

  bash -c  "$(curl -sL https://raw.githubusercontent.com/sdetweil/MagicMirror_scripts/master/upgrade-script.sh)" apply

and got his error

the log will be /home/pi/MagicMirror/installers/upgrade.log
No LSB modules are available.
doing test run = false
update log will be in /home/pi/MagicMirror/installers/upgrade.log

saving custom.css
Unable to determine upstream git repository
restoring custom.css

I’ve tried troubleshooting for a bit but can’t seem to fix it
my upgrade.log shows this

Upgrade started - Mon Jan  6 06:38:49 GMT 2020
system is Linux raspberrypi 4.19.75-v7l+ #1270 SMP Tue Sep 24 18:51:41 BST 2019 armv7l GNU/Linux
the os is Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster
user requested to apply changes
doing test run = false

saving custom.css
not english or locale not set, set git alias
alias git='LANG=en_US.UTF-8 git'
Unable to determine upstream git repository
restoring custom.css
removing git alias
Upgrade ended - Mon Jan  6 06:38:50 GMT 2020

I hope you guys can help!

sdetweil

@HarryBerry try my updated script again

HarryBerry

It works whatever you did thanks!