• Recent
  • Tags
  • Unsolved
  • Solved
  • MagicMirror² Repository
  • Documentation
  • 3rd-Party-Modules
  • Donate
  • Discord
  • Register
  • Login
MagicMirror Forum
  • Recent
  • Tags
  • Unsolved
  • Solved
  • MagicMirror² Repository
  • Documentation
  • 3rd-Party-Modules
  • Donate
  • Discord
  • Register
  • Login
A New Chapter for MagicMirror: The Community Takes the Lead
Read the statement by Michael Teeuw here.

error: Pulling is not possible because you have unmerged files.

Scheduled Pinned Locked Moved Unsolved Troubleshooting
39 Posts 2 Posters 10.7k Views 2 Watching
Loading More Posts
  • Oldest to Newest
  • Newest to Oldest
  • Most Votes
Reply
  • Reply as topic
Log in to reply
This topic has been deleted. Only users with topic management privileges can see it.
  • S Offline
    sdetweil @DazTypeR
    last edited by Nov 2, 2019, 2:05 PM

    @DazTypeR if you ran it without any parms at the end, it did not make ANY changes… it was a test, to make u feel comfortable and see the process once… (I don’t want to mess up your system, so it it find an error it cant fix, it tells you, and stops

    now, run it again and add the word ‘apply’ at the end

    Sam

    How to add modules

    learning how to use browser developers window for css changes

    1 Reply Last reply Reply Quote 0
    • D Offline
      DazTypeR
      last edited by sdetweil Nov 2, 2019, 2:18 PM Nov 2, 2019, 2:12 PM

      Sorry, probably didnt make myself clear.

      I knew the 1st script would not make any changes, how do i know the script worked and did not mess anything up?

      I dont see any messages output to the command line, it just finished.

      Sorry about my lack of understanding, I`m trying to learn as I go but its a long slog.

      This is the last thing it put out…

              fi
              # return to original folder
              cd - >/dev/null
              date +"Upgrade ended - %a %b %e %H:%M:%S %Z %Y" >>$logfile
      else
              echo It appears MagicMirror has not been installed on this system
              echo please run the installer, "raspberry.sh" first
      fi
      
      S 1 Reply Last reply Nov 2, 2019, 2:18 PM Reply Quote 0
      • S Offline
        sdetweil @DazTypeR
        last edited by Nov 2, 2019, 2:18 PM

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

        just 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

        Sam

        How to add modules

        learning how to use browser developers window for css changes

        1 Reply Last reply Reply Quote 0
        • D Offline
          DazTypeR
          last edited by Nov 2, 2019, 2:32 PM

          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?

          S 1 Reply Last reply Nov 2, 2019, 2:34 PM Reply Quote 0
          • S Offline
            sdetweil @DazTypeR
            last edited by Nov 2, 2019, 2:34 PM

            @DazTypeR no log file… hm…
            which sounds like your MagicMirror folder is not called ‘MagicMirror’

            look in user home folder ~/

            Sam

            How to add modules

            learning how to use browser developers window for css changes

            1 Reply Last reply Reply Quote 0
            • D Offline
              DazTypeR
              last edited by Nov 2, 2019, 2:42 PM

              It is called MagicMirror…

              pi@raspberrypi:~/MagicMirror

              S 1 Reply Last reply Nov 2, 2019, 2:43 PM Reply Quote 0
              • S Offline
                sdetweil @DazTypeR
                last edited by Nov 2, 2019, 2:43 PM

                @DazTypeR ok, show me the log ~/upgrade.log or ~/MagicMirror/installers/upgrade.log

                Sam

                How to add modules

                learning how to use browser developers window for css changes

                S 1 Reply Last reply Nov 2, 2019, 2:46 PM Reply Quote 0
                • S Offline
                  sdetweil @sdetweil
                  last edited by Nov 2, 2019, 2:46 PM

                  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
                  

                  Sam

                  How to add modules

                  learning how to use browser developers window for css changes

                  1 Reply Last reply Reply Quote 0
                  • D Offline
                    DazTypeR
                    last edited by Nov 2, 2019, 2:52 PM

                    I can’t find an upgrade.log either in home or in the MagicMirror/installers folder.

                    S 1 Reply Last reply Nov 2, 2019, 2:55 PM Reply Quote 0
                    • S Offline
                      sdetweil @DazTypeR
                      last edited by Nov 2, 2019, 2:55 PM

                      @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)"
                      

                      Sam

                      How to add modules

                      learning how to use browser developers window for css changes

                      1 Reply Last reply Reply Quote 0
                      • 1
                      • 2
                      • 3
                      • 4
                      • 1 / 4
                      1 / 4
                      • First post
                        10/39
                        Last post
                      Enjoying MagicMirror? Please consider a donation!
                      MagicMirror created by Michael Teeuw.
                      Forum managed by Sam, technical setup by Karsten.
                      This forum is using NodeBB as its core | Contributors
                      Contact | Privacy Policy