Read the statement by Michael Teeuw here.
error: Pulling is not possible because you have unmerged files.
-
Hang on, I just ran this command…
(curl -sL https://www.dropbox.com/s/lxzwyzohg61sppu/upgrade-script.sh?dl=0)
Should I have run this command…
bash -c “$(curl -sL https://www.dropbox.com/s/lxzwyzohg61sppu/upgrade-script.sh?dl=0)”
No idea what the bash -c does?
Would this have made a difference?
-
@DazTypeR yes… if you do it without bash -c, then it downloads the file, and throws it away
if you do the bash -c, then it executes the script (single command -c)
watch out for the double quotes… sometimes those turn into MS word document quotes, which linux shells don’t like
-
OK, so its official, I am a numpty :)
This is what I get now when I run it…
the log will be /home/pi/MagicMirror/installers/upgrade.log
doing test run = true
update log will be in /home/pi/MagicMirror/installers/upgrade.logsaving custom.css
upgrading from version 2.9.0 to 2.9.0
fetching latest revisions
bash: line 159: On branch master: command not found
there are 28 local files that are different than the master repo.eslintrc.json
.gitignore
.travis.yml
CHANGELOG.md
LICENSE.md
installers/raspberry.sh
js/main.js
modules/default/calendar/vendor/ical.js/node-ical.js
modules/default/clock/clock.js
modules/default/currentweather/currentweather.js
modules/default/newsfeed/newsfeed.js
modules/default/updatenotification/node_helper.js
modules/default/updatenotification/updatenotification.js
modules/default/weather/providers/darksky.js
modules/default/weather/providers/openweathermap.js
modules/default/weather/providers/ukmetoffice.js
modules/default/weather/providers/weathergov.js
modules/default/weather/weather.js
modules/default/weather/weatherprovider.js
modules/default/weatherforecast/weatherforecast.js
package.json
run-start.sh
tests/e2e/vendor_spec.js
translations/en.json
translations/es.json
translations/translations.js
vendor/package-lock.json
package-lock.jsonany *-lock.json files do not need to be saved
do you want to save these files for later (Y/n)?n
skipping restore for .eslintrc.json, doing test run
skipping restore for .gitignore, doing test run
skipping restore for .travis.yml, doing test run
skipping restore for CHANGELOG.md, doing test run
skipping restore for LICENSE.md, doing test run
skipping restore for installers/raspberry.sh, doing test run
skipping restore for js/main.js, doing test run
skipping restore for modules/default/calendar/vendor/ical.js/node-ical.js, doing test run
skipping restore for modules/default/clock/clock.js, doing test run
skipping restore for modules/default/currentweather/currentweather.js, doing test run
skipping restore for modules/default/newsfeed/newsfeed.js, doing test run
skipping restore for modules/default/updatenotification/node_helper.js, doing test run
skipping restore for modules/default/updatenotification/updatenotification.js, doing test run
skipping restore for modules/default/weather/providers/darksky.js, doing test run
skipping restore for modules/default/weather/providers/openweathermap.js, doing test run
skipping restore for modules/default/weather/providers/ukmetoffice.js, doing test run
skipping restore for modules/default/weather/providers/weathergov.js, doing test run
skipping restore for modules/default/weather/weather.js, doing test run
skipping restore for modules/default/weather/weatherprovider.js, doing test run
skipping restore for modules/default/weatherforecast/weatherforecast.js, doing test run
skipping restore for package.json, doing test run
skipping restore for run-start.sh, doing test run
skipping restore for tests/e2e/vendor_spec.js, doing test run
skipping restore for translations/en.json, doing test run
skipping restore for translations/es.json, doing test run
skipping restore for translations/translations.js, doing test run
skipping restore for vendor/package-lock.json, doing test run
skipping restore for package-lock.json, doing test run
processing dependency changes for active modules with package.json filesprocessing for module MMM-GooglePhotos please wait
skipped processing for MMM-GooglePhotos, doing test run
processing complete for module MMM-GooglePhotosrestoring custom.css
It then put me back to the command line.
-
@DazTypeR cool,just like it should have… altho… line 159 bothers me
can you run it again without apply, and use the debug flag
bash -c -x "$(curl -sL https://www.dropbox.com/s/lxzwyzohg61sppu/upgrade-script.sh?dl=0)"you will have to scroll back up in the terminal window, but I’d like to see the few lines above/below the error line 159
thx
-
Hope this has everything you need…
- echo current branch = master
++ git status - ‘On branch master’ ‘Your branch and ‘'‘origin/master’'’ have diverged,’ ‘and have 4 and 76 different commits each, respectively.’ ’ (use “git pull” to merge the remote branch into yours)’ ‘You have unmerged paths.’ ’ (fix conflicts and run “git commit”)’ ’ (use “git merge --abort” to abort the merge)’ ‘Changes to be committed:’ ’ modified: .eslintrc.json’ ’ modified: .gitignore’ ’ modified: .travis.yml’ ’ modified: CHANGELOG.md’ ’ modified: LICENSE.md’ ’ deleted: css/custom.css’ ’ modified: installers/raspberry.sh’ ’ modified: js/main.js’ ’ modified: modules/default/calendar/vendor/ical.js/node-ical.js’ ’ modified: modules/default/clock/clock.js’ ’ modified: modules/default/currentweather/currentweather.js’ ’ modified: modules/default/newsfeed/newsfeed.js’ ’ modified: modules/default/updatenotification/node_helper.js’ ’ modified: modules/default/updatenotification/updatenotification.js’ ’ modified: modules/default/weather/providers/darksky.js’ ’ modified: modules/default/weather/providers/openweathermap.js’ ’ modified: modules/default/weather/providers/ukmetoffice.js’ ’ modified: modules/default/weather/providers/weathergov.js’ ’ modified: modules/default/weather/weather.js’ ’ modified: modules/default/weather/weatherprovider.js’ ’ modified: modules/default/weatherforecast/weatherforecast.js’ ’ modified: package.json’ ’ modified: run-start.sh’ ’ new file: tests/configs/modules/weather/currentweather_default.js’ ’ new file: tests/configs/modules/weather/currentweather_options.js’ ’ new file: tests/configs/modules/weather/currentweather_units.js’ ’ new file: tests/configs/modules/weather/forecastweather_default.js’ ’ new file: tests/configs/modules/weather/forecastweather_options.js’ ’ new file: tests/e2e/modules/mocks/index.js’ ’ new file: tests/e2e/modules/mocks/weather_current.js’ ’ new file: tests/e2e/modules/mocks/weather_forecast.js’ ’ new file: tests/e2e/modules/weather_spec.js’ ’ modified: tests/e2e/vendor_spec.js’ ’ new file: tests/node_modules/webdriverajaxstub/index.js’ ’ modified: translations/en.json’ ’ modified: translations/es.json’ ’ new file: translations/ms-my.json’ ’ modified: translations/translations.js’ ’ new file: untrack-css.sh’ ’ modified: vendor/package-lock.json’ ‘Unmerged paths:’ ’ (use “git add …” to mark resolution)’ ’ both modified: package-lock.json’ ‘Untracked files:’ ’ (use “git add …” to include in what will be committed)’ ’ css/save_custom.css’ ’ installers/dumpactivemodules.js’
bash: line 159: On branch master: command not found
++ git status
++ grep modified
++ awk -F: ‘{print $2}’ - diffs=’ .eslintrc.json
.gitignore
.travis.yml
CHANGELOG.md
LICENSE.md
installers/raspberry.sh
js/main.js
modules/default/calendar/vendor/ical.js/node-ical.js
- echo current branch = master
-
@DazTypeR cool, can u try that one more time (without apply) to see if I fixed the line 159 problem
-
Just ran it again without the extra logging and a block of the output shows this…
saving custom.css
upgrading from version 2.9.0 to 2.9.0
fetching latest revisions
bash: line 159: On branch master: command not found
there are 28 local files that are different than the master repo -
@DazTypeR can I beg one more try?
-
saving custom.css
upgrading from version 2.9.0 to 2.9.0
fetching latest revisions
bash: line 154: [: missing `]’
MagicMirror git fetch failed
restoring custom.css -
@DazTypeR one last time
-
Nearly…
saving custom.css
upgrading from version 2.9.0 to 2.9.0
fetching latest revisions
bash: line 161: On branch master: command not found
there are 28 local files that are different than the master repo -
@DazTypeR ok, last time… hard to see the side effects
$(git status 2>&1) >>$logfilethat means execute the git status command , and THEN execute the results of THAT , and pass THOSE results to the log
what I wanted was
git status 2>&1 >>$logfileexec the git status command, and pass ITS results to the log
-
OK nice one, that has come back with no errors or anything. :)
Guessing I am correct in replying N to the question regarding lock.json files needed to be saved, I have no idea if I need them or not - lol?
-
@DazTypeR u should have seen a message
any *-lock.json files do not need to be saved -
Of course, sorry, my bad, I did read that.
So am I OK to run this now with the apply option and it should update me to 2.9.0?
Also, on the slim chance this mucks up, I backed up my SD card prioe to doing all this, guess I will be OK to just reflash the card with that backup image?
-
@DazTypeR yes, go ahead… good strategy. backup… never hurts…
thanks for all your help !!
my main computer boot drive is starting to fail…
time for a hard drive switch later today!
-
OK, so I ran the script with the apply option and it said something about the versions are the same and just finished.
Did all the test we do earlier pull down version 2.9.0 and that is what your installer is seeing?
Just rebooted the Pi in case and when the Magic Mirror booted up it still said there was an update needed.
-
@DazTypeR change apply to force
this was in case u had some failure part way thru…and had to restart
-
OK done that, it ran, threw out no errors that I could see, so rebooted the Pi using sudo reboot and it all booted back up OK but the Magic Mirror still says there is an update?
-
@DazTypeR show me the ~/MagicMirror/installers/upgrade.log
if u can’t post (please use the markdown code block) email to me, same userid as here on gmail
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