new update/upgrade script, ready for testing

[panos]

Guys, I’m little confused.
I currently running at v2.9 and I wish to upgrade to v2.10
If I run the command:
bash -c "$(curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/master/installers/upgrade-script.sh)” apply

MM won’t update to v2.10

If I try the ‘traditional’ way 'git pull && npm install’ and ignore any changes that I make I receive the error:

The following untracked working tree files would be overwritten by merge: installers/dumpactivemodules.js

see here:
https://forum.magicmirror.builders/topic/11912/problem-with-updating-to-2-10-0-from-2-9-0-using-update-script/2

Any suggestion on how to update to 2.10?

[sdetweil]

@panos the official script has a bug. Erase that file and use the updated version.

See
https://forum.magicmirror.builders/topic/10859/new-update-upgrade-script-ready-for-testing

[bdream]

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

See
https://forum.magicmirror.builders/topic/10859/new-update-upgrade-script-ready-for-testing

Sam, your link is looping or I’m wrong.

Can you please provide the link to the right script again? Sorry I’m confused and not able to update the MM.

[sdetweil]

@bdream the 1st post of this topic has the commands

[bdream]

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

the 1st post of this topic has the commands

it works :thumbs_up:
Many thanks AGAIN Sam!

[spitzlbergerj]

@sdetweil thanks for your great work. Unfortunately it does not work for me with the script.

When I execute the script I get the following messages:

bash -c  "$(curl -sL https://raw.githubusercontent.com/sdetweil/MagicMirror_scripts/master/upgrade-script.sh)"
the log will be /home/pi/MagicMirror/installers/upgrade.log
No LSB modules are available.
doing test run = true
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
fatal: Couldn't find remote ref origin
MagicMirror git fetch failed
restoring custom.css

The log file also contains the following:

not english or locale not set, set git alias
alias git='LC_ALL=en_US.UTF-8 git'
remote name = github-desktop-darkniki origin
upgrading from version 2.9.0 to 2.10.0
fetching latest revisions
git fetch rc=128
MagicMirror git fetch failed

Should I update manually or is there another way with the script?

Thanks

Sepp

[sdetweil]

@spitzlbergerj well, thats a new one…

i try to find the upstream git repo this installation came from, and then get the changes from there,
cause I want to be able to test the application of the changes without breaking the local system.

can u do

git remote 
and
git remote -v

thanks… it should be one word, but it looks like two on your system

[sdetweil]

@spitzlbergerj could u try this little script to see if I got it right?

curl -sL https://www.dropbox.com/s/80fevh39jme3iig/testlang.sh?dl=0 | bash

it will check the status of the 3 lang settings,

LANG=
LANGUAGE=
and LC_ALL=

[spitzlbergerj]

@sdetweil thanks for your Help. Here are the results

git remote
github-desktop-darkniki
origin

git remote -v
github-desktop-darkniki https://github.com/darkniki/MagicMirror.git (fetch)
github-desktop-darkniki https://github.com/darkniki/MagicMirror.git (push)
origin  https://github.com/MichMich/MagicMirror.git (fetch)
origin  https://github.com/MichMich/MagicMirror.git (push)

and for the second post:

curl -sL https://www.dropbox.com/s/80fevh39jme3iig/testlang.sh?dl=0 | bash
not english or locale not set, set git alias
alias git='LC_ALL=en_US.UTF-8 git'
Auf Branch master
Ihr Branch ist zu 'origin/master' um 117 Commits hinterher, und kann vorgespult werden.
  (benutzen Sie "git pull", um Ihren lokalen Branch zu aktualisieren)
Unversionierte Dateien:
  (benutzen Sie "git add <Datei>...", um die Änderungen zum Commit vorzumerken)

        core
        installers/dumpactivemodules.js

nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien (benutzen Sie "git add" zum Versionieren)

I hope this helps

Regards
Sepp

[sdetweil]

@spitzlbergerj thx. Can u try the last command again

[spitzlbergerj]

Good Morning @sdetweil

Here are the results from the just newly started command:

curl -sL https://www.dropbox.com/s/80fevh39jme3iig/testlang.sh?dl=0 | bash
not english or locale not set, set git alias
alias git='LANG=en_US.UTF-8 git'
Auf Branch master
Ihr Branch ist zu 'origin/master' um 117 Commits hinterher, und kann vorgespult werden.
  (benutzen Sie "git pull", um Ihren lokalen Branch zu aktualisieren)
Unversionierte Dateien:
  (benutzen Sie "git add <Datei>...", um die Änderungen zum Commit vorzumerken)

        core
        installers/dumpactivemodules.js

nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien (benutzen Sie "git add" zum Versionieren)

The result is the same as last night, right?

Regards
Sepp

[evroom]

@spitzlbergerj

Hi there, I do not want to interfere, as Sam is most capable, but can you give the output of this command?

locale -a

And tell if you see English or German output for those 2 commands?

LC_ALL=C git status

LC_MESSAGES=C git status

[sdetweil]

@evroom i remove the alias so, the output will not tell us anything…

I was hoping there was some priority of the settings…

LC_ALL doers override LANGUAGE…
but LANG doesn’t appear to be dynamically changeable per command

try the testlang script again, the locale doc says this should work…

[evroom]

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

i remove the alias so, the output will not tell us anything…

It will tell you if you get English as output, despite any language & variable settings.

I temporary changed the locale to de_DE.utf8 for testing and git status gave me German output.
Then I did LC_ALL=C git status and it replied in English.
LC_MESSAGES=C git status continued to reply in German.

Just FYI, perhaps it will help you, perhaps not :-)

[sdetweil]

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

Then I did LC_ALL=C git status and it replied in English.

cool… thats what the test script does… sets alias for git to ‘LC_ALL=C git’

I think I will just force alias

[sdetweil]

@spitzlbergerj great, thanks… u can run the update script again now…

if it says already at 2.10, the change the parm from apply to force

[evroom]

@sdetweil

Sam,

for some reason your testlang.sh script, using alias, is still responding in German, whereas the plain command responses in English:

pi@raspberrypi:~/MagicMirror $ curl -sL https://www.dropbox.com/s/80fevh39jme3iig/testlang.sh?dl=0 | bash
Auf Branch master
Ihr Branch ist auf demselben Stand wie 'origin/master'.
:
:

pi@raspberrypi:~/MagicMirror $ LC_ALL=C git status
On branch master
Your branch is up to date with 'origin/master'.
:
:

pi@raspberrypi:~/MagicMirror $ git status
Auf Branch master
Ihr Branch ist auf demselben Stand wie 'origin/master'.
:
:

Also interesting; using sh iso bash:

pi@raspberrypi:~/MagicMirror $ curl -sL https://www.dropbox.com/s/80fevh39jme3iig/testlang.sh?dl=0 | sh
On branch master
Your branch is up to date with 'origin/master'.

EDIT - recommendations / friendly advice:

1/ Use #!/bin/bash in your script, not ~/bin/bash
2/ Do not alias the git command, just plain LC_ALL=C git status

I am on 2.10.0, but can try your testlang.sh script when needed.
Will keep the language settings on German for a while.

[sdetweil]

@evroom thanks… I have multiple commands to issue, and wanted to use alias for it…

thanks for the catch on #~…

can u try the test script again?
u can also look at the alias list , to make sure the one for git is set

alias

[spitzlbergerj]

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

locale -a

the output is:

C
C.UTF-8
de_DE.utf8
POSIX

[spitzlbergerj]

@sdetweil Hi, I run the script just now again. The output is the same I guess:

curl -sL https://www.dropbox.com/s/80fevh39jme3iig/testlang.sh?dl=0 | bash
Auf Branch master
Ihr Branch ist zu 'origin/master' um 117 Commits hinterher, und kann vorgespult werden.
  (benutzen Sie "git pull", um Ihren lokalen Branch zu aktualisieren)
Unversionierte Dateien:
  (benutzen Sie "git add <Datei>...", um die Änderungen zum Commit vorzumerken)

        core
        installers/dumpactivemodules.js

nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien (benutzen Sie "git add" zum Versionieren)