Read the statement by Michael Teeuw here.
Update to v2.9.0 fail
-
pi@MagicMirror:~/MagicMirror $ bash -c "$(curl -sL https://www.dropbox.com/s/lxzwyzohg61sppu/upgrade-script.sh?dl=0)" apply doing test run = false update log will be in /home/pi/MagicMirror/installers/upgrade.log saving custom.css upgrading from version 2.8.0 to 2.9.0 fetching latest revisions there were merge errors error: Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge überschrieben werden: package-lock.json Bitte committen oder stashen Sie Ihre Änderungen, bevor Sie mergen. Abbruch Aktualisiere a31546b..500147e you should examine and resolve them using the command git log --oneline --decorate a31546b (grafted, HEAD -> master, tag: v2.8.0) Merge pull request #1717 from MichMich/develop restoring custom.cssUpgrade started - Mi Okt 16 15:31:26 CEST 2019 user requested to apply changes doing test run = false saving custom.css not english or locale not set, set git alias remote name = origin upgrading from version 2.8.0 to 2.9.0 fetching latest revisions current branch = master Auf Branch master Ihr Branch ist 2715 Commits hinter 'origin/master', und kann vorgespult werden. (benutzen Sie "git pull", um Ihren lokalen Branch zu aktualisieren) Änderungen, die nicht zum Commit vorgemerkt sind: (benutzen Sie "git add <Datei>...", um die Änderungen zum Commit vorzumerken) (benutzen Sie "git checkout -- <Datei>...", um die Änderungen im Arbeitsverzeichnis zu verwerfen) geändert: css/custom.css geändert: package-lock.json Unversionierte Dateien: (benutzen Sie "git add <Datei>...", um die Änderungen zum Commit vorzumerken) core css/save_custom.css installers/dumpactivemodules.js installers/pm2_MagicMirror_new.json mm.sh nohup.out keine Änderungen zum Commit vorgemerkt (benutzen Sie "git add" und/oder "git commit -a") no files different from github version test merge result rc='' , if empty, no conflicts executing merge, apply specified merge result rc= 1 error: Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge überschrieben werden: package-lock.json Bitte committen oder stashen Sie Ihre Änderungen, bevor Sie mergen. Abbruch Aktualisiere a31546b..500147e there were merge errors you should examine and resolve them using the command git log --oneline --decorate a31546b (grafted, HEAD -> master, tag: v2.8.0) Merge pull request #1717 from MichMich/develop restoring custom.css removing git alias Upgrade ended - Mi Okt 16 15:31:29 CEST 2019I’m sorry for german within the log :unamused_face:
-
@bdream said in Update to v2.9.0 fail:
geändert: css/custom.css
geändert: package-lock.jsonthat will do it… i search for english ‘modified’, but its not there…
ok, one more time… another reporting change
-
Upgrade started - Mi Okt 16 15:38:04 CEST 2019 user requested to apply changes doing test run = false saving custom.css not english or locale not set, set git alias alias git='LANGUAGE=en_US.UTF-8 git' remote name = origin upgrading from version 2.8.0 to 2.9.0 fetching latest revisions current branch = master Auf Branch master Ihr Branch ist 2715 Commits hinter 'origin/master', und kann vorgespult werden. (benutzen Sie "git pull", um Ihren lokalen Branch zu aktualisieren) Änderungen, die nicht zum Commit vorgemerkt sind: (benutzen Sie "git add <Datei>...", um die Änderungen zum Commit vorzumerken) (benutzen Sie "git checkout -- <Datei>...", um die Änderungen im Arbeitsverzeichnis zu verwerfen) geändert: css/custom.css geändert: package-lock.json Unversionierte Dateien: (benutzen Sie "git add <Datei>...", um die Änderungen zum Commit vorzumerken) %logfile core css/save_custom.css installers/dumpactivemodules.js installers/pm2_MagicMirror_new.json mm.sh nohup.out keine Änderungen zum Commit vorgemerkt (benutzen Sie "git add" und/oder "git commit -a") no files different from github version test merge result rc='' , if empty, no conflicts executing merge, apply specified merge result rc= 1 error: Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge überschrieben werden: package-lock.json Bitte committen oder stashen Sie Ihre Änderungen, bevor Sie mergen. Abbruch Aktualisiere a31546b..500147e there were merge errors you should examine and resolve them using the command git log --oneline --decorate a31546b (grafted, HEAD -> master, tag: v2.8.0) Merge pull request #1717 from MichMich/develop restoring custom.css removing git alias Upgrade ended - Mi Okt 16 15:38:06 CEST 2019 -
@bdream cool… do this
shopt | grep expandshould see this
expand_aliases onI bet you see this
expand_aliases off -
@sdetweil said in Update to v2.9.0 fail:
I bet you see this
expand_aliases offpi@MagicMirror:~/MagicMirror $ shopt | grep expand assoc_expand_once off direxpand off expand_aliases on -
-
@sdetweil said in Update to v2.9.0 fail:
try script again
pi@MagicMirror:~/MagicMirror $ bash -c "$(curl -sL https://www.dropbox.com/s/lxzwyzohg61sppu/upgrade-script.sh?dl=0)" apply doing test run = false update log will be in /home/pi/MagicMirror/installers/upgrade.log saving custom.css upgrading from version 2.8.0 to 2.9.0 fetching latest revisions there are 2 local files that are different than the master repo css/custom.css package-lock.json any *-lock.json files do not need to be saved do you want to save these files for later (Y/n)?Y *** Bitte geben Sie an, wer Sie sind. Führen Sie git config --global user.email "you@example.com" git config --global user.name "Your Name" aus, um das als Ihre standardmäßige Identität zu setzen. Lassen Sie die Option "--global" weg, um die Identität nur für dieses Repository zu setzen. fatal: Konnte die E-Mail-Adresse nicht automatisch erkennen ('pi@MagicMirror.(none)' erhalten) Kann den aktuellen Zustand des Index nicht speichern there were merge errors error: Your local changes to the following files would be overwritten by merge: package-lock.json Please commit your changes or stash them before you merge. Aborting Updating a31546b..500147e you should examine and resolve them using the command git log --oneline --decorate a31546b (grafted, HEAD -> master, tag: v2.8.0) Merge pull request #1717 from MichMich/develop restoring custom.css we stashed a set of files that appear changed from the latest repo versions. you should review them Keine Stash-Einträge gefunden. see installers/stashed_files for the list you can use git checkout stash@{0} -- filename to extract one file from the stash or git stash pop to restore them all WARNING.. WARNING.. either will overlay the file just installed by the update WARNING..custom.css is realy touched by me but should not be affected by updates I thougt.
*** Bitte geben Sie an, wer Sie sind. Führen Sie git config --global user.email "you@example.com" git config --global user.name "Your Name" aus, um das als Ihre standardmäßige Identität zu setzen. Lassen Sie die Option "--global" weg, um die Identität nur für dieses Repository zu setzen. fatal: Konnte die E-Mail-Adresse nicht automatisch erkennen ('pi@MagicMirror.(none)' erhalten) Kann den aktuellen Zustand des Index nicht speichernthat says about the git configuration is not correct. But I never configured git on the Pi. Do I need to do?
The fatal is about the e-mail was not to get detected automaticly. For sure there was never a e-mail configured for nothing at the Pi.
Index can not be saved.Keine Stash-Einträge gefunden.Says 'no Stash-entries were found. whatever that mens.
-
@bdream hang on…
-
@sdetweil try this, note just adding another parm
bash -c -i "$(curl -sL https://www.dropbox.com/s/lxzwyzohg61sppu/upgrade-script.sh?dl=0)" applyalso show results of, notice dot in front of filename
cat ~/.bashrc -
@bdream said in Update to v2.9.0 fail:
custom.css is realy touched by me but should not be affected by updates I thougt.
prior to this release, custom.css was considered a core file, and was overlayed on updates.
this release puts in a fix for that… but I save/restore it anyhowstash is a place where you can hold modified files, but continue on with your work.
it requires some setup, but my script is supposed to go that for you -
pi@MagicMirror:~/MagicMirror $ bash -c -i "$(curl -sL https://www.dropbox.com/s/lxzwyzohg61sppu/upgrade-script.sh?dl=0)" apply doing test run = false update log will be in /home/pi/MagicMirror/installers/upgrade.log saving custom.css upgrading from version 2.8.0 to 2.9.0 fetching latest revisions there were merge errors error: Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge überschrieben werden: package-lock.json Bitte committen oder stashen Sie Ihre Änderungen, bevor Sie mergen. Abbruch Aktualisiere a31546b..500147e you should examine and resolve them using the command git log --oneline --decorate a31546b (grafted, HEAD -> master, tag: v2.8.0) Merge pull request #1717 from MichMich/develop restoring custom.cssupgrade.log
Upgrade started - Mi Okt 16 17:12:12 CEST 2019 user requested to apply changes doing test run = false saving custom.css not english or locale not set, set git alias alias egrep='egrep --color=auto' alias fgrep='fgrep --color=auto' alias git='LANGUAGE=en_US.UTF-8 git' alias grep='grep --color=auto' alias ls='ls --color=auto' remote name = origin upgrading from version 2.8.0 to 2.9.0 fetching latest revisions current branch = master Auf Branch master Ihr Branch ist 2715 Commits hinter 'origin/master', und kann vorgespult werden. (benutzen Sie "git pull", um Ihren lokalen Branch zu aktualisieren) Änderungen, die nicht zum Commit vorgemerkt sind: (benutzen Sie "git add <Datei>...", um die Änderungen zum Commit vorzumerken) (benutzen Sie "git checkout -- <Datei>...", um die Änderungen im Arbeitsverzeichnis zu verwerfen) geändert: css/custom.css geändert: package-lock.json Unversionierte Dateien: (benutzen Sie "git add <Datei>...", um die Änderungen zum Commit vorzumerken) %logfile core css/save_custom.css installers/dumpactivemodules.js installers/pm2_MagicMirror_new.json installers/stashed_files mm.sh nohup.out keine Änderungen zum Commit vorgemerkt (benutzen Sie "git add" und/oder "git commit -a") no files different from github version test merge result rc='' , if empty, no conflicts executing merge, apply specified merge result rc= 1 error: Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge überschrieben werden: package-lock.json Bitte committen oder stashen Sie Ihre Änderungen, bevor Sie mergen. Abbruch Aktualisiere a31546b..500147e there were merge errors you should examine and resolve them using the command git log --oneline --decorate a31546b (grafted, HEAD -> master, tag: v2.8.0) Merge pull request #1717 from MichMich/develop restoring custom.css removing git alias Upgrade ended - Mi Okt 16 17:12:14 CEST 2019pi@MagicMirror:~/MagicMirror $ cat ~/.bashrc # ~/.bashrc: executed by bash(1) for non-login shells. # see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) # for examples # If not running interactively, don't do anything case $- in *i*) ;; *) return;; esac # don't put duplicate lines or lines starting with space in the history. # See bash(1) for more options HISTCONTROL=ignoreboth # append to the history file, don't overwrite it shopt -s histappend # for setting history length see HISTSIZE and HISTFILESIZE in bash(1) HISTSIZE=1000 HISTFILESIZE=2000 # check the window size after each command and, if necessary, # update the values of LINES and COLUMNS. shopt -s checkwinsize # If set, the pattern "**" used in a pathname expansion context will # match all files and zero or more directories and subdirectories. #shopt -s globstar # make less more friendly for non-text input files, see lesspipe(1) #[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" # set variable identifying the chroot you work in (used in the prompt below) if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then debian_chroot=$(cat /etc/debian_chroot) fi # set a fancy prompt (non-color, unless we know we "want" color) case "$TERM" in xterm-color|*-256color) color_prompt=yes;; esac # uncomment for a colored prompt, if the terminal has the capability; turned # off by default to not distract the user: the focus in a terminal window # should be on the output of commands, not on the prompt force_color_prompt=yes if [ -n "$force_color_prompt" ]; then if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then # We have color support; assume it's compliant with Ecma-48 # (ISO/IEC-6429). (Lack of such support is extremely rare, and such # a case would tend to support setf rather than setaf.) color_prompt=yes else color_prompt= fi fi if [ "$color_prompt" = yes ]; then PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w \$\[\033[00m\] ' else PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' fi unset color_prompt force_color_prompt # If this is an xterm set the title to user@host:dir case "$TERM" in xterm*|rxvt*) PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" ;; *) ;; esac # enable color support of ls and also add handy aliases if [ -x /usr/bin/dircolors ]; then test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" alias ls='ls --color=auto' #alias dir='dir --color=auto' #alias vdir='vdir --color=auto' alias grep='grep --color=auto' alias fgrep='fgrep --color=auto' alias egrep='egrep --color=auto' fi # colored GCC warnings and errors #export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' # some more ls aliases #alias ll='ls -l' #alias la='ls -A' #alias l='ls -CF' # Alias definitions. # You may want to put all your additions into a separate file like # ~/.bash_aliases, instead of adding them here directly. # See /usr/share/doc/bash-doc/examples in the bash-doc package. if [ -f ~/.bash_aliases ]; then . ~/.bash_aliases fi # enable programmable completion features (you don't need to enable # this, if it's already enabled in /etc/bash.bashrc and /etc/profile # sources /etc/bash.bashrc). if ! shopt -oq posix; then if [ -f /usr/share/bash-completion/bash_completion ]; then . /usr/share/bash-completion/bash_completion elif [ -f /etc/bash_completion ]; then . /etc/bash_completion fi fi -
@bdream what a battle!
in the short term, erase package-lock.json
also show me output of
echo $LC_ALL -
@sdetweil said in Update to v2.9.0 fail:
erase package-lock.json
done!
seems update is working now :grinning_face:pi@MagicMirror:~/MagicMirror $ bash -c -i "$(curl -sL https://www.dropbox.com/s/lxzwyzohg61sppu/upgrade-script.sh?dl=0)" apply doing test run = false update log will be in /home/pi/MagicMirror/installers/upgrade.log saving custom.css upgrading from version 2.8.0 to 2.9.0 fetching latest revisions updating MagicMirror runtime, please wait > electron@3.0.13 postinstall /home/pi/MagicMirror/node_modules/electron > node install.js Downloading tmp-5207-1-SHASUMS256.txt-3.0.13 [============================================>] 100.0% of 4.79 kB (4.79 kB/s) > magicmirror@2.9.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 12.241s found 5 vulnerabilities (4 low, 1 high) run `npm audit fix` to fix them, or `npm audit` for details > magicmirror@2.9.0 postinstall /home/pi/MagicMirror > sh untrack-css.sh && sh installers/postinstall/postinstall.sh && npm run install-fonts We'll remove from the repository the css/custom.css This script apply git update-index --skip-worktree css/custom.css rm 'css/custom.css' MagicMirror installation successful! > magicmirror@2.9.0 install-fonts /home/pi/MagicMirror > cd fonts && npm install audited 1 package in 1.629s 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. added 173 packages from 113 contributors, removed 132 packages, updated 181 packages, moved 1 package and audited 3475 packages in 1071.546s found 28 vulnerabilities (1 low, 1 moderate, 26 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-Carousel please wait ---------------------------------- audited 859 packages in 17.666s found 2 high severity vulnerabilities run `npm audit fix` to fix them, or `npm audit` for details processing complete for module MMM-Carousel processing for module MMM-PublicTransportHafas please wait ---------------------------------- audited 41 packages in 2.153s found 0 vulnerabilities processing complete for module MMM-PublicTransportHafas processing for module MMM-PublicTransportHafas please wait ---------------------------------- audited 41 packages in 3.251s found 0 vulnerabilities processing complete for module MMM-PublicTransportHafas processing for module MMM-PublicTransportHafas please wait ---------------------------------- audited 41 packages in 3.956s found 0 vulnerabilities processing complete for module MMM-PublicTransportHafas restoring custom.csspm2 start mm…and it looks GOOD! :rolling_on_the_floor_laughing:
It’s great after such a … work? … getting it solved.Thank you sooo much. On my own I would install from scatch :frowning_face: and this is nothing I can bring to my family.
and here you asked
pi@MagicMirror:~/MagicMirror $ echo $LC_ALL de_DE.UTF-8would say this is one of the first thing I do installing Raspian :grimacing_face:
-
@bdream said in Update to v2.9.0 fail:
pi@MagicMirror:~/MagicMirror $ echo $LC_ALL
de_DE.UTF-8bingo… things you learn!..
LC_ALL overrides LANG or LANGUAGE=
I just have to fix my alias…
would u be willing to test the fix… no changes to your local running system
package-lock.json should exist
ls package-lock.jsonthen
bash -c "$(curl -sL https://www.dropbox.com/s/lxzwyzohg61sppu/upgrade-script.sh?dl=0)" forcewhen u see the message about saving files, just hit ctrl-c to exit
-
@sdetweil said in Update to v2.9.0 fail:
when u see the message about saving files, just hit ctrl-c to exit
I was to slow for hitting ctrl-c :nerd_face:
As this is a huge of lines my buffer is to small.
Is there a log or is there no interest to u of the outcome? -
@bdream yes the install.log
but it should have waited for you to reply about writing over package-lock.json
hm… if package.lock.json does NOT exist
then create it
touch package-lock.json -
@sdetweil said in Update to v2.9.0 fail:
hm… if package.lock.json does NOT exist
nono, it did exist
pi@MagicMirror:~/MagicMirror $ ls pack* package.json package-lock.jsonbut the script run fast
bash -c "$(curl -sL https://www.dropbox.com/s/lxzwyzohg61sppu/upgrade-script.sh?dl=0)" forcewhat path I can find the install.log?
-
@bdream sorry, not install… upgrade.log
doing test run = false
update log will be in /home/pi/MagicMirror/installers/upgrade.logon the package-lock.json… it is the same as the update… thus why it didn’t stop
could edit it an add a space someplace
-
@sdetweil upgrade.log is here from …force… no it isn’t.
I can’t copy the 2738 lines in here.
How can I bring it to you?And what does this mean?
on the package-lock.json… it is the same as the update… thus why it didn’t stop could edit it an add a space someplace -
@bdream said in Update to v2.9.0 fail:
upgrade.log is here from …force… no it isn’t.
I can’t copy the 2738 lines in here.you can email it , same userid as here on gmail
And what does this mean? on the package-lock.json… it is the same as the update… thus why it didn’t stop could edit it an add a space someplacethe upgrade should have stopped at the package-lock.json file, just like before…
but it didn’t… so I looked back at the 2.9.0 package being installed, and it has a package-lock.json file…so, the one now on the disk is the new one… and a git status will show it hasn’t changed…
so, we could MAKE it be different, by using a text editor (like the one you use on the config.js file)
and add 1 space character (hit the spacebar)
and then save it… then it will be different
Hello! It looks like you're interested in this conversation, but you don't have an account yet.
Getting fed up of having to scroll through the same posts each visit? When you register for an account, you'll always come back to exactly where you were before, and choose to be notified of new replies (either via email, or push notification). You'll also be able to save bookmarks and upvote posts to show your appreciation to other community members.
With your input, this post could be even better 💗
Register Login