Read the statement by Michael Teeuw here.
Unsolved error: Pulling is not possible because you have unmerged files.
-
@DazTypeR
ok… the UPDATE script only updates… do you have a ~/MagicMirror folder??
it sounded like you did, cause you were trying to do a git pulljust go run your mirror again… again, it makes NO changes to your local working copy.
(it did download updates to the local git repo (~/MagicMirror/.git folder), but did not apply any updates)post the log from ~/MagicMirorr/installers/upgrade.log
please use the markdown code block feature…
paste the log text, select the text.
push the </> button -
Yes I have a MagicMirror folder as I have managed to run my mirror for 10 months and have managed to do 2 upgrades in that time but in the past it has always told me what the error is and mostly how to fix it.
With regards to posting the log, there is no upgrade.log file in that directory?
-
@DazTypeR no log file… hm…
which sounds like your MagicMirror folder is not called ‘MagicMirror’look in user home folder ~/
-
It is called MagicMirror…
pi@raspberrypi:~/MagicMirror
-
@DazTypeR ok, show me the log ~/upgrade.log or ~/MagicMirror/installers/upgrade.log
-
the upgrade script does this at the beginning
# if the MagicMirroe folder exists if [ -d ~/MagicMirror ]; then # put the log where the script is located logdir=$(dirname $($cmd -f "$0")) # if the script was execute from the web if [[ $logdir != *"MagicMirror/installers"* ]]; then # use the MagicMirror/installers folder cd ~/MagicMirror/installers >/dev/null logdir=$(pwd) cd - >/dev/null fi logfile=$logdir/upgrade.log
-
I can’t find an upgrade.log either in home or in the MagicMirror/installers folder.
-
@DazTypeR well then
so, when u run it it says
It appears MagicMirror has not been installed on this system please run the installer, "raspberry.sh" first
if so, rerun the script like this
bash -c -x "$(curl -sL https://www.dropbox.com/s/lxzwyzohg61sppu/upgrade-script.sh?dl=0)"
-
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