~$ git config --global user.name "Your Name"
@@ -22,21 +22,23 @@ All Crunch scripts are managed through the @git@ revision control system. Befor
On the Arvados Workbench, navigate to "Compute %(rarr)→% Code repositories":https://{{site.arvados_workbench_host}}/repositories. You should see a repository with your user name listed in the *name* column. Next to *name* is the column *push_url*. Copy the *push_url* value associated with your repository. This should look like git@git.{{ site.arvados_api_host }}:you.git
.
-Next, on the Arvados virtual machine, clone your git repository:
+Next, on the Arvados virtual machine, clone your Git repository:
-~$ git clone git@git.{{ site.arvados_api_host }}:you.git
+~$ cd $HOME # (or wherever you want to install)
+~$ git clone git@git.{{ site.arvados_api_host }}:you.git
Cloning into 'you'...
-This will create an git checkout in the directory called *@you@*.
+This will create a Git repository in the directory called *@you@* in your home directory. Say yes when prompted to continue with connection.
+Ignore any warning that you are cloning an empty repository.
{% include 'notebox_begin' %}
-For more information about using @git@, try
+For more information about using Git, try
notextile. $ man gittutorial
-or *"search Google for git tutorials":http://google.com/#q=git+tutorial*.
+or *"search Google for Git tutorials":http://google.com/#q=git+tutorial*.
{% include 'notebox_end' %}
h2. Creating a Crunch script
@@ -53,7 +55,7 @@ Next, using @nano@ or your favorite Unix text editor, create a new file called @
notextile. ~/you/crunch_scripts$ nano hash.py
-Add the following code to compute the md5 hash of each file in a collection:
+Add the following code to compute the MD5 hash of each file in a collection:
{% code 'tutorial_hash_script_py' as python %}
@@ -62,20 +64,20 @@ Make the file executable:
notextile. ~/you/crunch_scripts$ chmod +x hash.py
{% include 'notebox_begin' %}
-The steps below describe how to execute the script after committing changes to git. To run a script locally for testing, please see "debugging a crunch script":{{site.baseurl}}/user/topics/tutorial-job-debug.html.
+The steps below describe how to execute the script after committing changes to Git. To run a script locally for testing, please see "debugging a crunch script":{{site.baseurl}}/user/topics/tutorial-job-debug.html.
{% include 'notebox_end' %}
-Next, add the file to git staging. This tells @git@ that the file should be included on the next commit.
+Next, add the file to the staging area. This tells @git@ that the file should be included on the next commit.
notextile. ~/you/crunch_scripts$ git add hash.py
-Next, commit your changes to git. All staged changes are recorded into the local git repository:
+Next, commit your changes. All staged changes are recorded into the local git repository:
~/you/crunch_scripts$ git commit -m"my first script"
[master (root-commit) 27fd88b] my first script
- 1 file changed, 33 insertions(+)
+ 1 file changed, 45 insertions(+)
create mode 100755 crunch_scripts/hash.py
@@ -87,7 +89,7 @@ Counting objects: 4, done.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (4/4), 682 bytes, done.
Total 4 (delta 0), reused 0 (delta 0)
-To git@git.qr1hi.arvadosapi.com:you.git
+To git@git.qr1hi.arvadosapi.com:you.git
* [new branch] master -> master
@@ -109,7 +111,7 @@ Next, create a file that contains the pipeline definition:
"dataclass": "Collection"
}
},
- "repository":"