Update to v2.9.0 fail

[bdream]

@sdetweil SORRY!

pi@MagicMirror:~/MagicMirror $  git status
On branch master
Your branch is behind 'origin/master' by 2715 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   css/custom.css
        modified:   package-lock.json

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        core
        installers/dumpactivemodules.js
        installers/pm2_MagicMirror_new.json
        mm.sh
        nohup.out

no changes added to commit (use "git add" and/or "git commit -a")

[sdetweil]

@bdream weird… says code should handle it

try this

alias
alias git='LANGUAGE=en_US.UTF-8 git'
git status | grep modified | awk -F: '{print $2}'
unalias git >/dev/null

thanks

[bdream]

@sdetweil

pi@MagicMirror:~/MagicMirror $  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'
pi@MagicMirror:~/MagicMirror $  alias git='LANGUAGE=en_US.UTF-8 git'
pi@MagicMirror:~/MagicMirror $  git status | grep modified | awk -F: '{print $2}'
   css/custom.css
   package-lock.json
pi@MagicMirror:~/MagicMirror $  unalias git >/dev/null

[sdetweil]

@bdream weird…

can u try the script again? i am recording the output of the git status command, manually it detects the file

[bdream]

@sdetweil

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

[sdetweil]

@bdream can u show me the log again

[bdream]

Upgrade started - Mi Okt 16 15:22:29 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
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:22:31 CEST 2019

[sdetweil]

@bdream said in Update to v2.9.0 fail:

current branch = master
???
no files different from github version

there is supposed to be output from the git status command right there ???

I just made another tiny log reporting change… one more time please

[bdream]

@sdetweil

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

Upgrade 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 2019

I’m sorry for german within the log :unamused_face:

[sdetweil]

@bdream said in Update to v2.9.0 fail:

geändert: css/custom.css
geändert: package-lock.json

that will do it… i search for english ‘modified’, but its not there…

ok, one more time… another reporting change

[bdream]

@sdetweil

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

[sdetweil]

@bdream cool… do this

shopt | grep expand 

should see this

expand_aliases  on

I bet you see this

expand_aliases  off

[bdream]

@sdetweil said in Update to v2.9.0 fail:

I bet you see this
expand_aliases off

pi@MagicMirror:~/MagicMirror $   shopt | grep expand
assoc_expand_once       off
direxpand       off
expand_aliases  on

[sdetweil]

@bdream said in Update to v2.9.0 fail:

expand_aliases on

yeh, but it didn’t!!

try script again

[bdream]

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

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

[sdetweil]

@bdream hang on…

[sdetweil]

@sdetweil try this, note just adding another parm

bash -c -i  "$(curl -sL https://www.dropbox.com/s/lxzwyzohg61sppu/upgrade-script.sh?dl=0)" apply

also show results of, notice dot in front of filename

cat ~/.bashrc

[sdetweil]

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

stash 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

[bdream]

@sdetweil

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

upgrade.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 2019

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

[sdetweil]

@bdream what a battle!

in the short term, erase package-lock.json

also show me output of

echo $LC_ALL