[beginner] updating via github

  Thread Rating:
  • 0 Votes - 0 Average
  • 1
  • 2
  • 3
  • 4
  • 5
Post Reply
dandirk Offline
Senior Member
Posts: 226
Joined: Oct 2008
Reputation: 1
Post: #16
This is what I did for Ubuntu 8.10...

Install and run initial setup and download (from daveisadork)

Installs git client
Code:
sudo apt-get install git-core

Navigate to skins folder in home directory and download aeon (again from davisadork)
Code:
cd ~/.xbmc/skin
git clone git://github.com/djh/aeon.git

Navigate to Aeon folder and switch to Auriga branch
Code:
cd ~/.xbmc/skin/aeon
git checkout -b auriga origin/auriga

Now you can navigate to aeon folder (if you are already not there) and update the auriga branch

Code:
cd ~/.xbmc/skin/aeon
git pull

This will install the auriga branch into the aeon folder, if you want to create a new folder/skin for auriga while keeping "Aeon Stark" as well, run the same git clone command that hikaricore used. The auriga at the end just tells it to create a auriga folder instead of the default aeon I think.

Code:
git clone git://github.com/djh/aeon.git auriga

Then when navigating instead of cd ~/.xbmc/skin/aeon use cd ~/.xbmc/skin/auriga
(This post was last modified: 2009-04-27 05:16 by dandirk.)
find quote
yazgar Offline
Junior Member
Posts: 20
Joined: Aug 2008
Reputation: 0
Post: #17
Thought I'd post my own bit of help for anyone having trouble "gettin" git. ???

This is for windows uses ie xp / vista, and will use msysgit with its command line interface (don't stress, it's easier than the GUI option..honest)


I almost gave up myself and was just going to keep downloading the new auriga zip files every few days to keep it as fresh as possible.

The problem with that is you are downloading everything all over again!! This is why all this "git pull" talk is so popular at the moment, because it will check what has changed on djh's hard drive - well just about :;): - and only update anything that he's changed! Instantly - well just about :;):

Now let me just say, I had never heard of git, have hardly used command prompt stuff, and would probably call myself a "jack of all trades and a master of none" when it comes to all things PC. So if i go around things a bit arse backwards - apologies in advance.

I went about it a bit differently because I already had a copy of auriga in my C:program files/xbmc/skin/ directory, so this is where I'll tell you to start! ready..go..
    We need an auriga folder inside your XBMC skin directory. ie mine is - C:program files/xbmc/skin/auriga, and in there is all skin stuff! So if you have already been downloading the zip files from git and have it in an auriga folder then you're good to go. If not go here and click the download button, then choose zip file from popup to download. Unzip it and go into the folders until you see the 720p folder, language folder etc, select everything here and copy.
    Go to your install directory, (like mine above) and create an auriga folder inside the skin folder and paste all that stuff you just copied in there.
    You'll also need to download the latest fonts folder from here. Put the fonts folder into the auriga folder as well.
    Now we need to download msysgit from here. Once you have it, run it, just leave everything default BUT MAKE SURE you select the git bash choice during install because that's the command line interface we want to use.
    Once it's installed, find the Git Bash icon in your start menu or desktop and start it up. It's just a simple command line type of deal.
    type the following so that it looks EXACTLY like this below - spaces and all - obviously where it says 'your email' you actually put in your real email address!

    $ ssh-keygen -C "your@email.com" -t rsa

    and press enter.

    This creates a key file called id_rsa.pub and saves it either here for vista people- C:\Users\YourNameHere\.ssh\ or C:\Documents and Settings\YourNameHere\.ssh\ for XP users.
    Leave Git Bash for a minute and go find that .ssh folder from one of the paths above, right click the id_rsa.pub file inside and open it with notepad. It will look like a bunch of numbers and letters with your email at the end, select all and copy!
    OK, leave all that for now and go to GIT and register on the site here. Put in a user name , password etc. In the SSH public key box we need to paste all the stuff you just copied from the id_rsa.pub file you opened with notepad. So paste that in hit the sign me up button!
Almost there..really!.. Honest ;
    Now we can go back to Git Bash. To use the "git pull" command correctly we need to issue the command from the auriga directory. At the moment Git Bash probably looks something like this:

    Username@PCNAME ~
    $


    We need to point this to our auriga folder. This may be different for you depending on your drive letter, or if, like me you map a drive over a network.
    Best way is to navigate to your auriga skin directory in windows explorer and use the address bar as a guide. The standard thing to type would probably be something like:
    $ cd C:/program files/xbmc/skin/auriga

    Press enter. If it finds auriga it should now say:

    Username@PCNAME /c/program files/xbmc/skin/auriga <master>
    $


    As long as you get that <master> part your set. All you need to do now is issue the pull command:

    $ git pull git://github.com/djh/aeon.git auriga

If it's way out of date it may update (download) lots, it may update nothing. I just checked now - last update about 4 hrs ago when I started this! and it shows that Duncan has been busy as usual!! This is what an update looks like:

[Image: aVj0Yx0.jpg]

Now hopefully it all went PERFECT!...if not, either you messed up or I did ;) .Check you did all the steps and typed and pasted everything, check your / \ are the right way round and spaces all in the right spot. It is getting late and I just wrote all this from memory so I pray I didn't forget some major step, if I did let me know.
Now whenever you want to update, just open Git Bash, cd to the correct directory and issue the git pull command and you'll always be on the cutting edge.

Well I'm done! Hope this helped make things clearer than mud.
find quote
ppic Offline
Skilled Python Coder
Posts: 2,711
Joined: Feb 2009
Reputation: 11
Location: France idf
Post: #18
arg !!

i don't understand :

> git pull
/opt/libexec/git-core/git-pull: /opt/libexec/git-core/git-pull: 163: tr: not found
You asked me to pull without telling me which branch you
want to merge with, and 'branch.auriga.merge' in
your configuration file does not tell me either. Please
specify which branch you want to merge on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.

If you often merge with the same branch, you may want to
configure the following variables in your configuration
file:

branch.auriga.remote = <nickname>
branch.auriga.merge = <remote-ref>
remote.<nickname>.url = <url>
remote.<nickname>.fetch = <refspec>

See git-config(1) for details.
/opt/libexec/git-core/git-pull: /opt/libexec/git-core/git-pull: 163: tr: not found
You asked me to pull without telling me which branch you
want to merge with, and 'branch.auriga.merge' in
your configuration file does not tell me either. Please
specify which branch you want to merge on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.
find quote
rickatnight11 Offline
Senior Member
Posts: 138
Joined: Apr 2008
Reputation: 0
Location: Richmond, VA
Post: #19
ppic, first make sure that you are in the actual aeon skin directory. Run pwd to find your present working directory. It should be similar to ~/.xbmc/skin/aeon. If you are not in the actual aeon directory, but instead the skin directory (or anywhere else) then this is your problem. When you first run the git pull command it will download the repository into a directory called aeon from wherever you were at the time. Then you must actually cd into that directory to run the git pull command (and of course the git checkout command if you wanted to change branches.)

[04/03/2009 04:42:13PM Agent (Prashant_190023): "You are most welcome to the best democratic countries of the world -- India"] --Dell Chat
find quote
ppic Offline
Skilled Python Coder
Posts: 2,711
Joined: Feb 2009
Reputation: 11
Location: France idf
Post: #20
i'm in, i followed what danrik've done
find quote
rickatnight11 Offline
Senior Member
Posts: 138
Joined: Apr 2008
Reputation: 0
Location: Richmond, VA
Post: #21
Can you start a new terminal session, navigate to the directory, check out the auriga branch, and try to pull the code? Copy all of the terminal to a text file and attach it to a post here. I'd like to see what you are doing and what happens.

[04/03/2009 04:42:13PM Agent (Prashant_190023): "You are most welcome to the best democratic countries of the world -- India"] --Dell Chat
find quote
ppic Offline
Skilled Python Coder
Posts: 2,711
Joined: Feb 2009
Reputation: 11
Location: France idf
Star   
Post: #22
ok i'm on it

Code:
login as: root
root@192.168.0.6's password:

BusyBox v1.1.0 (2009.03.06-16:49+0000) Built-in shell (ash)
Enter 'help' for a list of built-in commands.

DiskStation> cd /volume1/test/xbmc/skin/aeon
DiskStation> git checkout -b auriga origin/auriga
fatal: git checkout: branch auriga already exists
DiskStation> git pull
/opt/libexec/git-core/git-pull: /opt/libexec/git-core/git-pull: 163: tr: not found
You asked me to pull without telling me which branch you
want to merge with, and 'branch.auriga.merge' in
your configuration file does not tell me either.        Please
specify which branch you want to merge on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.

If you often merge with the same branch, you may want to
configure the following variables in your configuration
file:

    branch.auriga.remote = <nickname>
    branch.auriga.merge = <remote-ref>
    remote.<nickname>.url = <url>
    remote.<nickname>.fetch = <refspec>

See git-config(1) for details.
DiskStation> git pull
(This post was last modified: 2009-04-27 21:02 by ppic.)
find quote
dandirk Offline
Senior Member
Posts: 226
Joined: Oct 2008
Reputation: 1
Post: #23
ok looks like you already have a local auriga branch... I ran into this issue...

This will show you what local branches you have, a * should show infront of the active branch (probably will list master and auriga)
Code:
cd /volume1/test/xbmc/skin/aeon
git branch -r

If auriga is already there you could delete it

Code:
cd /volume1/test/xbmc/skin/aeon
git branch -d auriga

Then run the git branch -b auriga origin/auriga command again to rebuild the local branch and switch to it.

I think I also has some success with
Code:
git pull auriga
(This post was last modified: 2009-04-27 21:11 by dandirk.)
find quote
ppic Offline
Skilled Python Coder
Posts: 2,711
Joined: Feb 2009
Reputation: 11
Location: France idf
Post: #24
Code:
DiskStation> git branch -r
  origin/HEAD
  origin/auriga
  origin/master
find quote
dandirk Offline
Senior Member
Posts: 226
Joined: Oct 2008
Reputation: 1
Post: #25
doh sorry run just git branch

the -r is for remote branches on the server not local
find quote
dandirk Offline
Senior Member
Posts: 226
Joined: Oct 2008
Reputation: 1
Post: #26
I will be able to check out my machine when I got home... I figured out my guide last night so I wasn't able to test a git pull update...
find quote
ppic Offline
Skilled Python Coder
Posts: 2,711
Joined: Feb 2009
Reputation: 11
Location: France idf
Post: #27
Code:
DiskStation> git branch
* auriga
  master
find quote
rickatnight11 Offline
Senior Member
Posts: 138
Joined: Apr 2008
Reputation: 0
Location: Richmond, VA
Post: #28
Now follow the rest of his directions:
dandirk Wrote:If auriga is already there you could delete it

Code:
cd /volume1/test/xbmc/skin/aeon
git branch -d auriga

Then run the git branch -b auriga origin/auriga command again to rebuild the local branch and switch to it.

I think I also has some success with
Code:
git pull auriga

[04/03/2009 04:42:13PM Agent (Prashant_190023): "You are most welcome to the best democratic countries of the world -- India"] --Dell Chat
find quote
ppic Offline
Skilled Python Coder
Posts: 2,711
Joined: Feb 2009
Reputation: 11
Location: France idf
Post: #29
arg!
error when i tried to delete.

Code:
DiskStation> git branch -d auriga
error: Cannot delete the branch 'auriga' which you are currently on.

and when i try to pull:

Code:
DiskStation> git pull auriga
fatal: 'auriga': unable to chdir or not a git archive
fatal: The remote end hung up unexpectedly
(This post was last modified: 2009-04-27 22:28 by ppic.)
find quote
rickatnight11 Offline
Senior Member
Posts: 138
Joined: Apr 2008
Reputation: 0
Location: Richmond, VA
Post: #30
Switch over to the master branch with
Code:
git checkout -b master
and then try to remove the auriga branch again.

[04/03/2009 04:42:13PM Agent (Prashant_190023): "You are most welcome to the best democratic countries of the world -- India"] --Dell Chat
find quote