Commit 37d352df authored by Holger Dinkel's avatar Holger Dinkel

Merge branch 'master' of git.embl.de:dinkel/linuxcommandline

parents 8c8381de 42dff13c
......@@ -26,7 +26,7 @@
<key>MasterSheets</key>
<array/>
<key>ModificationDate</key>
<string>2013-05-29 18:26:40 +0000</string>
<string>2014-05-19 12:08:52 +0000</string>
<key>Modifier</key>
<string>Frank Thommen</string>
<key>NotesVisible</key>
......@@ -5420,6 +5420,403 @@ myscript.sh "my title" -h 2WEr4.pdb}</string>
<key>VPages</key>
<integer>1</integer>
</dict>
<dict>
<key>ActiveLayerIndex</key>
<integer>0</integer>
<key>AutoAdjust</key>
<false/>
<key>BackgroundGraphic</key>
<dict>
<key>Bounds</key>
<string>{{0, 0}, {1118, 783}}</string>
<key>Class</key>
<string>SolidGraphic</string>
<key>ID</key>
<integer>2</integer>
<key>Style</key>
<dict>
<key>shadow</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
<key>stroke</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
</dict>
</dict>
<key>BaseZoom</key>
<integer>0</integer>
<key>CanvasOrigin</key>
<string>{0, 0}</string>
<key>ColumnAlign</key>
<integer>1</integer>
<key>ColumnSpacing</key>
<real>36</real>
<key>DisplayScale</key>
<string>1.000 cm = 1.000 cm</string>
<key>GraphicsList</key>
<array>
<dict>
<key>Class</key>
<string>LineGraphic</string>
<key>ID</key>
<integer>245</integer>
<key>Points</key>
<array>
<string>{311, 439}</string>
<string>{346, 439}</string>
</array>
<key>Style</key>
<dict>
<key>stroke</key>
<dict>
<key>Color</key>
<dict>
<key>b</key>
<string>1</string>
<key>g</key>
<string>0</string>
<key>r</key>
<string>0</string>
</dict>
<key>HeadArrow</key>
<string>0</string>
<key>Legacy</key>
<true/>
<key>TailArrow</key>
<string>0</string>
<key>Width</key>
<real>2</real>
</dict>
</dict>
</dict>
<dict>
<key>Class</key>
<string>LineGraphic</string>
<key>ID</key>
<integer>244</integer>
<key>Points</key>
<array>
<string>{173, 446}</string>
<string>{208, 446}</string>
</array>
<key>Style</key>
<dict>
<key>stroke</key>
<dict>
<key>Color</key>
<dict>
<key>b</key>
<string>0</string>
<key>g</key>
<string>0</string>
<key>r</key>
<string>1</string>
</dict>
<key>HeadArrow</key>
<string>0</string>
<key>Legacy</key>
<true/>
<key>TailArrow</key>
<string>0</string>
<key>Width</key>
<real>2</real>
</dict>
</dict>
</dict>
<dict>
<key>Class</key>
<string>LineGraphic</string>
<key>ID</key>
<integer>242</integer>
<key>Points</key>
<array>
<string>{86, 446}</string>
<string>{121, 446}</string>
</array>
<key>Style</key>
<dict>
<key>stroke</key>
<dict>
<key>Color</key>
<dict>
<key>b</key>
<string>0.4</string>
<key>g</key>
<string>0.4</string>
<key>r</key>
<string>0.4</string>
</dict>
<key>HeadArrow</key>
<string>0</string>
<key>Legacy</key>
<true/>
<key>TailArrow</key>
<string>0</string>
<key>Width</key>
<real>2</real>
</dict>
</dict>
</dict>
<dict>
<key>Class</key>
<string>LineGraphic</string>
<key>ControlPoints</key>
<array>
<string>{-48, -4}</string>
<string>{-0.00012863058110212933, 68.999946594118398}</string>
<string>{0, -69}</string>
<string>{-41, 3}</string>
</array>
<key>ID</key>
<integer>241</integer>
<key>Points</key>
<array>
<string>{176, 322}</string>
<string>{55, 200}</string>
<string>{139, 70}</string>
</array>
<key>Style</key>
<dict>
<key>stroke</key>
<dict>
<key>Bezier</key>
<true/>
<key>Color</key>
<dict>
<key>b</key>
<string>0.4</string>
<key>g</key>
<string>0.4</string>
<key>r</key>
<string>0.4</string>
</dict>
<key>HeadArrow</key>
<string>Arrow</string>
<key>Legacy</key>
<true/>
<key>LineType</key>
<integer>1</integer>
<key>TailArrow</key>
<string>0</string>
<key>Width</key>
<real>2</real>
</dict>
</dict>
</dict>
<dict>
<key>Class</key>
<string>LineGraphic</string>
<key>ControlPoints</key>
<array>
<string>{-27, -1}</string>
<string>{-8.0001512710082636, 53.99991415562863}</string>
<string>{8, -54}</string>
<string>{-39, 0}</string>
</array>
<key>ID</key>
<integer>240</integer>
<key>Points</key>
<array>
<string>{139, 367}</string>
<string>{79, 274}</string>
<string>{193, 192}</string>
</array>
<key>Style</key>
<dict>
<key>stroke</key>
<dict>
<key>Bezier</key>
<true/>
<key>Color</key>
<dict>
<key>b</key>
<string>1</string>
<key>g</key>
<string>0</string>
<key>r</key>
<string>0</string>
</dict>
<key>HeadArrow</key>
<string>0</string>
<key>Legacy</key>
<true/>
<key>LineType</key>
<integer>1</integer>
<key>TailArrow</key>
<string>Arrow</string>
<key>Width</key>
<real>2</real>
</dict>
</dict>
</dict>
<dict>
<key>Class</key>
<string>LineGraphic</string>
<key>ControlPoints</key>
<array>
<string>{-27, -1}</string>
<string>{7.9998770495781031, 54.999968348849876}</string>
<string>{-8, -55}</string>
<string>{-35, 7}</string>
</array>
<key>ID</key>
<integer>236</integer>
<key>Points</key>
<array>
<string>{194, 250}</string>
<string>{92, 172}</string>
<string>{139, 76}</string>
</array>
<key>Style</key>
<dict>
<key>stroke</key>
<dict>
<key>Bezier</key>
<true/>
<key>Color</key>
<dict>
<key>b</key>
<string>0</string>
<key>g</key>
<string>0</string>
<key>r</key>
<string>1</string>
</dict>
<key>HeadArrow</key>
<string>Arrow</string>
<key>Legacy</key>
<true/>
<key>LineType</key>
<integer>1</integer>
<key>TailArrow</key>
<string>0</string>
<key>Width</key>
<real>2</real>
</dict>
</dict>
</dict>
<dict>
<key>Bounds</key>
<string>{{139, 55}, {296, 338}}</string>
<key>Class</key>
<string>ShapedGraphic</string>
<key>FontInfo</key>
<dict>
<key>Font</key>
<string>Courier</string>
<key>Size</key>
<real>24</real>
</dict>
<key>ID</key>
<integer>234</integer>
<key>Magnets</key>
<array>
<string>{0.5, 0}</string>
</array>
<key>Shape</key>
<string>Rectangle</string>
<key>Style</key>
<dict>
<key>shadow</key>
<dict>
<key>Draws</key>
<string>NO</string>
</dict>
</dict>
<key>Text</key>
<dict>
<key>Align</key>
<integer>0</integer>
<key>Text</key>
<string>{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf510
{\fonttbl\f0\fmodern\fcharset0 Courier;\f1\fmodern\fcharset0 Courier-Oblique;}
{\colortbl;\red255\green255\blue255;\red0\green0\blue255;\red255\green0\blue0;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\f0\fs48 \cf0 while
\f1\i condition_1
\f0\i0 \
do\
if
\f1\i condition_2
\f0\i0 \
then\
\cf2 continue\cf0 \
elif
\f1\i condition_3
\f0\i0 \
\cf3 break\cf0 \
fi\
\f1\i do_something
\f0\i0 \
done\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\f1\i \cf0 continue_here}</string>
</dict>
<key>TextPlacement</key>
<integer>0</integer>
</dict>
</array>
<key>GridInfo</key>
<dict>
<key>GridSpacing</key>
<real>18</real>
<key>MajorGridSpacing</key>
<integer>4</integer>
</dict>
<key>HPages</key>
<integer>2</integer>
<key>KeepToScale</key>
<false/>
<key>Layers</key>
<array>
<dict>
<key>Lock</key>
<string>NO</string>
<key>Name</key>
<string>Layer 1</string>
<key>Print</key>
<string>YES</string>
<key>View</key>
<string>YES</string>
</dict>
</array>
<key>LayoutInfo</key>
<dict>
<key>Animate</key>
<string>NO</string>
<key>circoMinDist</key>
<real>18</real>
<key>circoSeparation</key>
<real>0.0</real>
<key>layoutEngine</key>
<string>dot</string>
<key>neatoSeparation</key>
<real>0.0</real>
<key>twopiSeparation</key>
<real>0.0</real>
</dict>
<key>Orientation</key>
<integer>2</integer>
<key>PrintOnePage</key>
<false/>
<key>RowAlign</key>
<integer>1</integer>
<key>RowSpacing</key>
<real>14.17322826385498</real>
<key>SheetTitle</key>
<string>Canvas 4</string>
<key>UniqueID</key>
<integer>4</integer>
<key>VPages</key>
<integer>1</integer>
</dict>
</array>
<key>SmartAlignmentGuidesActive</key>
<string>YES</string>
......@@ -5430,7 +5827,7 @@ myscript.sh "my title" -h 2WEr4.pdb}</string>
<key>WindowInfo</key>
<dict>
<key>CurrentSheet</key>
<integer>1</integer>
<integer>3</integer>
<key>ExpandedCanvases</key>
<array>
<dict>
......@@ -5481,6 +5878,11 @@ myscript.sh "my title" -h 2WEr4.pdb}</string>
<real>1</real>
<real>1</real>
</array>
<array>
<string>Canvas 4</string>
<real>1</real>
<real>1</real>
</array>
</array>
</dict>
</dict>
......
......@@ -206,8 +206,8 @@ or based on the success of the respective previous command:
*{ cmds; }* --
Group commands to create one single output stream: The commands are run in the current (!) shell.
.. note:: The opening "``{``" must be followed by a blank and the last command must be succeeded by a `semicolon (``;``)
..
.. note:: The opening "``{``" must be followed by a blank and the last command must be succeeded by a `semicolon (``;``)
..
Example: Change into ``/etc`` and list its content. You are still in ``/etc`` after the bracketed expression (compare to the example above)::
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment