diff --git a/git_beginner/Makefile b/git_beginner/Makefile index aa304913c0e38667627c2eb8632254dfb66c8d8c..805b54bab4cfd04962ed15155a159575cb9008a7 100644 --- a/git_beginner/Makefile +++ b/git_beginner/Makefile @@ -94,7 +94,7 @@ epub: certificates: mkdir -p $(BUILDDIR)/certificates - pdflatex -interaction=nonstopmode -output-directory=$(BUILDDIR)/certificates "\def\coursetitle{Introductory Course:\\\\GIT for Beginners} \input{../general/CertificateOfParticipation.tex}" + pdflatex -interaction=nonstopmode -output-directory=$(BUILDDIR)/certificates "\def\coursetitle{Introductory Course:\\\\GIT Fundamentals} \input{../general/CertificateOfParticipation.tex}" @echo @echo "Build finished. The epub file is in $(BUILDDIR)/certificates." diff --git a/git_beginner/_build/latex/gitintro.pdf b/git_beginner/_build/latex/gitintro.pdf new file mode 100644 index 0000000000000000000000000000000000000000..4d5d32c50e72b4af698bafad7e3de9a8dde23d50 Binary files /dev/null and b/git_beginner/_build/latex/gitintro.pdf differ diff --git a/git_beginner/conf.py b/git_beginner/conf.py index 20aee98b92ba099a526ab7492311a2b053dd9753..e57bbfdd45f21b3c88035280ae497b600a8d3bbe 100644 --- a/git_beginner/conf.py +++ b/git_beginner/conf.py @@ -41,7 +41,7 @@ source_encoding = 'utf-8' master_doc = 'index' # General information about the project. -project = u'git basics' +project = u'git fundamentals' copyright = u'2013-2015, Holger Dinkel & Grischa Toedt' # The version info for the project you're documenting, acts as replacement for @@ -110,7 +110,7 @@ html_theme = 'nature' # The name for this set of Sphinx documents. If None, it defaults to # "<project> v<release> documentation". -html_title = "git basics" +html_title = "git fundamentals" # A shorter title for the navigation bar. Default is the same as html_title. #html_short_title = None @@ -194,7 +194,7 @@ latex_elements = { # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ - ('index', 'gitintro.tex', u'GIT Basics', + ('index', 'gitintro.tex', u'GIT Fundamentals', u'Holger Dinkel \& Grischa Toedt', 'manual'), ] @@ -224,7 +224,7 @@ latex_show_urls = False # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'gitintro', u'GIT Basics', + ('index', 'gitintro', u'GIT Fundamentals', [u'Holger Dinkel & Grischa Toedt'], 1) ] @@ -238,8 +238,8 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'gitintro', u'GIT Basics', - u'Holger Dinkel & Grischa Toedt', 'gitintro', 'GIT Basics', + ('index', 'gitintro', u'GIT Fundamentals', + u'Holger Dinkel & Grischa Toedt', 'gitintro', 'GIT Fundamentals', 'Miscellaneous'), ] diff --git a/linux_intermediate/_build/latex/IntermediateLinuxCourse.pdf b/linux_intermediate/_build/latex/IntermediateLinuxCourse.pdf index 81920a0d2ff2a674a1310776906d56f41cbd01c5..be202f9be891f7fd33dc26f2ba9bfdf349541fe5 100644 Binary files a/linux_intermediate/_build/latex/IntermediateLinuxCourse.pdf and b/linux_intermediate/_build/latex/IntermediateLinuxCourse.pdf differ diff --git a/linux_intermediate/basic_scripting.rst b/linux_intermediate/basic_scripting.rst index 442804c036cede3d84d628debd154e843e110854..3a5acbca18b6fda3aadbfe88f5ec442d77145143 100644 --- a/linux_intermediate/basic_scripting.rst +++ b/linux_intermediate/basic_scripting.rst @@ -202,11 +202,12 @@ You can mix multiple ``&&`` and ``||`` controls into a single line. /home/fthommen/a $ - Example: Count the heterogens described in a gzipped PDB file or, if it doesn't exist, - download the file:: - - $ gzip -c 4ZZN.pdb.gz && sed -n '/^HET /p' || wget "http://www.rcsb.org/pdb/files/4ZZN.pdb.gz" - $ +.. not working: +.. Example: Count the heterogens described in a gzipped PDB file or, if it doesn't exist, +.. download the file:: +.. +.. $ { gunzip -c 4ZZN.pdb.gz | sed -n '/^HET /p' } || wget "http://www.rcsb.org/pdb/files/4ZZN.pdb.gz" +.. $ *( cmds )* -- Group commands to create one single output stream: The commands are run in a subshell (i.e. a new shell is opened to run them): @@ -367,7 +368,7 @@ B) Evaluating of conditions or comparisons: - Examples: Test for the existence of /etc/passwd:: + Examples: Test for the existence of the directory `sequence_files`:: if [ -e ./sequence_files ] then @@ -640,7 +641,7 @@ $@: .. image:: _static/arguments.png -If you run the script :: +If you run the following script :: #!/bin/sh echo The script is $0 @@ -809,9 +810,9 @@ becomes: :: -q clngnew \ -M 150000 \ -R "select[(mem > 15000)]" \ - /g/software/bin/pymol-1.4 -r -p < pymol.pml + /g/software/bin/pymol -c -r pymol.pml -Which is way better to read and to maintain +Which is way better to read and to maintain... Script Debugging ----------------