Change syntax of 'and' and 'or' to infix order

darcs-hash:20060105153753-ac50b-4413a5d2652232bb38c97f5c673251193fc848ec.gz
This commit is contained in:
axel
2006-01-06 01:37:53 +10:00
parent 6a0460f51e
commit f6b2b9f9a5
7 changed files with 25 additions and 84 deletions

View File

@@ -2,22 +2,16 @@
\section and and - Conditionally execute a command
\subsection and-synopsis Synopsis
<tt>and COMMAND1; COMMAND2</tt>
<tt>COMMAND1; and COMMAND2</tt>
\subsection and-description Description
The \c and builtin is used to execute one command, and if it returns
zero status, also execute a second command.
The \c and builtin is used to execute a command if the current exit status (as set by the last previous command) is zero
\subsection and-example Example
The following code runs the \c make command to build a program, and if it suceeds, it runs <tt>make install</tt>, which installs the program.
<pre>
and make; make install
make; and make install
</pre>
\c or and \c and can be nested, as in this example, that attempts to build and install a program, and removed the files created by the build process on failiure
<pre>
or and make; make install; make clean
</pre>

View File

@@ -678,6 +678,7 @@ The following commands are distributed with fish. Many of them are
builtins or shellscript functions, and can only be used inside fish.
- <a href="builtins.html#source">.</a>, read and execute the commands in a file
- <a href="builtins.html#and">and</a>, execute second command if first suceeds
- <a href="builtins.html#bg">bg</a>, set a command to the background
- <a href="builtins.html#begin">begin</a>, execute a block of commands
- <a href="builtins.html#bind">bind</a>, change keyboard bindings
@@ -709,6 +710,7 @@ builtins or shellscript functions, and can only be used inside fish.
- <a href="commands.html#mimedb">mimedb</a>, view mimedata about a file
- <a href="commands.html#nextd">nextd</a>, move forward in the directory history
- <a href="builtins.html#not">not</a>, negates the exit status of any command
- <a href="builtins.html#or">or</a>, execute second command if first fails
- <a href="commands.html#popd">popd</a>, move to the topmost directory on the directory stack
- <a href="commands.html#prevd">prevd</a>, move backwards in the direcotry stack
- <a href="commands.html#pushd">pushd</a>, push the surrent directory onto the directory stack

View File

@@ -2,22 +2,16 @@
\section or or - Conditionally execute a command
\subsection or-synopsis Synopsis
<tt>or COMMAND1; COMMAND2</tt>
<tt>COMMAND1; or COMMAND2</tt>
\subsection or-description Description
The \c or builtin is used to execute one command, and if it returns
non-zero status, also execute a second command.
The \c or builtin is used to execute a command if the current exit status (as set by the last previous command) is non-zero
\subsection or-example Example
The following code runs the \c make command to build a program, or if it fails, it runs <tt>make clean</tt>, which removes the files created by the build process
<pre>
or make; make clean
make; or make clean
</pre>
\c or and \c and can be nested, as in this example, that attempts to build and install a program, and removed the files created by the build process on failiure
<pre>
or and make; make install; make clean
</pre>