new update/upgrade script, ready for testing

bobwilliams

pi@raspberrypi:~/MagicMirror $ git merge-tree ~ git merge-base master HEAD ~ HEAD master
usage: git merge-tree
pi@raspberrypi:~/MagicMirror $ git stash show
No stash entries found.
pi@raspberrypi:~/MagicMirror $ git stash

*** Please tell me who you are.

Run

git config --global user.email “you@example.com”
git config --global user.name “Your Name”

to set your account’s default identity.
Omit --global to set the identity only in this repository.

fatal: unable to auto-detect email address (got ‘pi@raspberrypi.(none)’)
Cannot save the current index state
pi@raspberrypi:~/MagicMirror $ git pull
Updating a31546b…500147e
error: Your local changes to the following files would be overwritten by merge:
modules/default/currentweather/currentweather.js
modules/default/weather/weather.js
modules/default/weatherforecast/weatherforecast.js
package-lock.json
run-start.sh
Please commit your changes or stash them before you merge.
Aborting
pi@raspberrypi:~/MagicMirror $

sdetweil

@bobwilliams great!!.. let me see what I can do about that…

also ~ git , that is the tilde character, i need the single quote leaning to the left (backtic), same keyboard key for me, just not with shift

sdetweil

@bobwilliams lets try this

git -c user.name=upgrade_script -c user.email=script@upgrade.com stash
then 
git stash show

bobwilliams

@sdetweil English is not my native language … sorry but I did not quite understand what to do

sdetweil

@bobwilliams no problems… no need to apologize… we will work thru it…

ps, I can’t speak ANYTHING in your language.

bobwilliams

pi@raspberrypi:~/MagicMirror $ git -c user.name=upgrade_script -c user.email=script@upgrade.com stash
Saved working directory and index state WIP on master: a31546b Merge pull request #1717 from MichMich/develop
pi@raspberrypi:~/MagicMirror $ git stash show
installers/mm.sh | 2 ±
modules/default/calendar/calendar.js | 4 ±
modules/default/currentweather/currentweather.js | 2 ±
modules/default/weather/weather.js | 2 ±
modules/default/weatherforecast/weatherforecast.js | 2 ±
package-lock.json | 799 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++±-------------------------------------------------
run-start.sh | 4 ±
7 files changed, 442 insertions(+), 373 deletions(-)

sdetweil

@bobwilliams cool… then try this

git status
git -c user.name=upgrade_script -c user.email=script@upgrade.com stash pop 
git status

bobwilliams

pi@raspberrypi:~/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)

Untracked files:
(use “git add …” to include in what will be committed)

    $
    0
    installers/dumpactivemodules.js
    installers/mm_temp.sh
    installers/pm2_MagicMirror_new.json
    installers/startMagicMirror.sh
    installers/stashed_files
    xdotool.sh

nothing added to commit but untracked files present (use “git add” to track)
pi@raspberrypi:~/MagicMirror $ git -c user.name=upgrade_script -c user.email=script@upgrade.com stash pop
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 …” to update what will be committed)
(use “git checkout – …” to discard changes in working directory)

    modified:   installers/mm.sh
    modified:   modules/default/calendar/calendar.js
    modified:   modules/default/currentweather/currentweather.js
    modified:   modules/default/weather/weather.js
    modified:   modules/default/weatherforecast/weatherforecast.js
    modified:   package-lock.json
    modified:   run-start.sh

Untracked files:
(use “git add …” to include in what will be committed)

    $
    0
    installers/dumpactivemodules.js
    installers/mm_temp.sh
    installers/pm2_MagicMirror_new.json
    installers/startMagicMirror.sh
    installers/stashed_files
    xdotool.sh

no changes added to commit (use “git add” and/or “git commit -a”)
Dropped refs/stash@{0} (83cd0d8b2b4ace83bbebb79d03b3d7456a861583)
pi@raspberrypi:~/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 …” to update what will be committed)
(use “git checkout – …” to discard changes in working directory)

    modified:   installers/mm.sh
    modified:   modules/default/calendar/calendar.js
    modified:   modules/default/currentweather/currentweather.js
    modified:   modules/default/weather/weather.js
    modified:   modules/default/weatherforecast/weatherforecast.js
    modified:   package-lock.json
    modified:   run-start.sh

Untracked files:
(use “git add …” to include in what will be committed)

    $
    0
    installers/dumpactivemodules.js
    installers/mm_temp.sh
    installers/pm2_MagicMirror_new.json
    installers/startMagicMirror.sh
    installers/stashed_files
    xdotool.sh

no changes added to commit (use “git add” and/or “git commit -a”)
pi@raspberrypi:~/MagicMirror $

sdetweil

@bobwilliams fabulous!!

so the ‘problem’ was that there were modified files found…
you asked to save them, but the save command (stash) failed, because it needed some additional info
so the files weren’t merged, and then we reinstalled the currently downloaded version (2.8.0)
I didn’t detect that, i do now

so, when u have time, please retry the upgrade script.

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

bobwilliams

thanks, I’ll try now