new update/upgrade script, ready for testing

[sdetweil]

@Mykle1 cool. Thanks for the test. Updated script to handle

[Mykle1]

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

Thanks for the test. Updated script to handle

I wish I would have waited for the updated script. I went ahead and installed a new MM because I couldn’t move forward with what I am doing. Again, thanks for your scripts. I will continue to use them. They’re awesome. :thumbsup:

[sdetweil]

@Mykle1 I think u did the right thing. The “handle” is to bail out gracefully if there is no git repo locally (zip file install doesn’t provide any path forward, that I have found)

[Mykle1]

@sdetweil

Understood, thanks. :-)

[sdetweil]

Added some reporting of current version and version upgrading to.

Also had path that did a live merge when u were just testing. Fixed that

[sdetweil]

another update… i was reporting ALL the files that changed between versions, but who cares (things are SUPPOSED the change!)… we only care if there is a conflict… fixed that

[potts-mike]

I am getting the below errors when trying to run your installer script, thoughts?

bash: line 18: $‘\r’: command not found
bash: line 20: $‘\r’: command not found
bash: line 27: $‘\r’: command not found
bash: -c: line 28: syntax error near unexpected token $'{\r'' 'ash: -c: line 28: trim() {

[sdetweil]

@potts-mike thanks… try now… danged editing from windows got the wrong line end characters…

[potts-mike]

it ran with the following errors and magic mirror did not start.

install log being saved to /home/pi/MagicMirror/installers/install.log
Hit:1 http://raspbian.raspberrypi.org/raspbian stretch InRelease
Get:2 http://archive.raspberrypi.org/debian stretch InRelease [25.4 kB]
Fetched 25.4 kB in 1s (22.4 kB/s)                              
Reading package lists... Done
Reading package lists... Done
Building dependency tree       
Reading state information... Done
build-essential is already the newest version (12.3).
curl is already the newest version (7.52.1-5+deb9u9).
git is already the newest version (1:2.11.0-3+deb9u4).
unzip is already the newest version (6.0-21+deb9u2).
wget is already the newest version (1.18-5+deb9u3).
The following packages were automatically installed and are no longer required:
  coinor-libipopt1v5 libmumps-seq-4.10.0 libraw15
Use 'sudo apt autoremove' to remove them.
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
(node:4945) [DEP0022] DeprecationWarning: os.tmpDir() is deprecated. Use os.tmpdir() instead.
Reading package lists... Done
Building dependency tree       
Reading state information... Done
npm is already the newest version (1.4.21+ds-2).
The following packages were automatically installed and are no longer required:
  coinor-libipopt1v5 libmumps-seq-4.10.0 libraw15
Use 'sudo apt autoremove' to remove them.
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
(node:4979) [DEP0022] DeprecationWarning: os.tmpDir() is deprecated. Use os.tmpdir() instead.
npm WARN package.json path-is-inside@1.0.2 No README data
npm WARN package.json sorted-object@2.0.1 No README data
/usr/local/bin/npm -> /usr/local/lib/node_modules/npm/bin/npm-cli.js
/usr/local/bin/npx -> /usr/local/lib/node_modules/npm/bin/npx-cli.js
npm WARN package.json config-chain@1.1.12 No license field.
npm WARN package.json cyclist@0.2.2 No license field.
npm WARN package.json json-schema@0.2.3 No license field.
npm WARN package.json punycode@1.4.1 punycode is also the name of a node core module.
npm WARN package.json qrcode-terminal@0.12.0 No license field.
npm WARN package.json string_decoder@1.2.0 string_decoder is also the name of a node core module.
npm@6.11.3 /usr/local/lib/node_modules/npm

[sdetweil]

@potts-mike can u send me the install.log, /home/pi/MagicMirror/installers/install.log

same userid as here at gmail

or post it here

[sdetweil]

@potts-mike also, try again… fixed a messaging problem

but… you have MM already installed… (if the folder exists, cause the log is put there)…
so, you should be using the update-script to bring to next version…

[satsatt]

@sdetweil Can You help me please with this, running Your script gives me this

doing test run = false
update log will be in /home/pi/MagicMirror/installers/upgrade.log
saving custom.css
upgrading from version 2.6.0 to 2.8.0
fetching latest revisions

error: Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge
überschrieben werden:
	package-lock.json
	vendor/package-lock.json
Bitte committen oder stashen Sie Ihre Änderungen, bevor sie mergen.
Abbruch
there were merge errors
you should examine and resolve them
using the command git log --oneline --decorate
de57daa (grafted, HEAD -> 

how do i commit or stash?

[sdetweil]

@satsatt can u post the contents of /home/pi/MagicMirror/installers/upgrade.log

to stash, it is git stash

but it should have prompted you to do that… so, please wait til I look thru the log

[satsatt]

@sdetweil ```
Upgrade started - Sa Sep 14 09:01:30 CEST 2019
doing test run = true
downloading dumpactivemodules script
saving custom.css
remote name = origin
upgrading from version 2.6.0 to 2.8.0
fetching latest revisions
current branch = master
no files different from github version

test merge result rc=‘’ if empty, no conflicts
skipping merge, only test run
processing dependency changes for active modules with package.json files
processing for module MMM-SystemStats . please wait

skipped processing for MMM-SystemStats, doing test run
processing for module MMM-DWD-WarnWeather . please wait

skipped processing for MMM-DWD-WarnWeather, doing test run
restoring custom.css
Upgrade ended - Sa Sep 14 09:01:33 CEST 2019

Upgrade started - Sa Sep 14 09:02:16 CEST 2019
user requested to apply changes
doing test run = false
saving custom.css
remote name = origin
upgrading from version 2.6.0 to 2.8.0
fetching latest revisions
current branch = master
no files different from github version

test merge result rc=‘’ if empty, no conflicts
executing merge, apply specified
merge result rc= 1 Aktualisiere de57daa…a31546b
restoring custom.css
Upgrade ended - Sa Sep 14 09:02:18 CEST 2019

Upgrade started - Sa Sep 14 14:50:08 CEST 2019
user requested to apply changes
doing test run = false
saving custom.css
remote name = origin
upgrading from version 2.6.0 to 2.8.0
fetching latest revisions
current branch = master
no files different from github version

[sdetweil]

@satsatt great thanks…

can u show me the results of
git status

thanks

[satsatt]

@sdetweil ```
pi@raspberrypi:~/MagicMirror $ git status
Auf Branch master
Ihr Branch ist zu ‘origin/master’ um 2639 Commits hinterher, und kann vorgespult werden.
(benutzen Sie “git pull”, um Ihren lokalen Branch zu aktualisieren)
zum Commit vorgemerkte Änderungen:
(benutzen Sie “git reset HEAD …” zum Entfernen aus der Staging-Area)

geändert:       package-lock.json
geändert:       vendor/package-lock.json

Unversionierte Dateien:
(benutzen Sie “git add …”, um die Änderungen zum Commit vorzumerken)

installers/dumpactivemodules.js

[sdetweil]

@satsatt english word search…

can u show me output of

locale

[satsatt]

pi@raspberrypi:~/MagicMirror $ locale
LANG=de_DE.UTF-8
LANGUAGE=de_DE.UTF-8
LC_CTYPE="de_DE.UTF-8"
LC_NUMERIC="de_DE.UTF-8"
LC_TIME="de_DE.UTF-8"
LC_COLLATE="de_DE.UTF-8"
LC_MONETARY="de_DE.UTF-8"
LC_MESSAGES="de_DE.UTF-8"
LC_PAPER="de_DE.UTF-8"
LC_NAME="de_DE.UTF-8"
LC_ADDRESS="de_DE.UTF-8"
LC_TELEPHONE="de_DE.UTF-8"
LC_MEASUREMENT="de_DE.UTF-8"
LC_IDENTIFICATION="de_DE.UTF-8"
LC_ALL=de_DE.UTF-8

[satsatt]

you want git status in english i suppose?

[sdetweil]

@satsatt yes, working on that…