diff --git a/doc_src/bind.txt b/doc_src/bind.txt index 614a14950..add185a11 100644 --- a/doc_src/bind.txt +++ b/doc_src/bind.txt @@ -48,7 +48,7 @@ readable as well. Key bindings are not saved between sessions by default. To save custom keybindings, edit the \c fish_user_key_bindings function and insert the -appropirate \c bind statements. +appropriate \c bind statements. The following parameters are available: diff --git a/doc_src/function.txt b/doc_src/function.txt index c072c5518..8d8e45193 100644 --- a/doc_src/function.txt +++ b/doc_src/function.txt @@ -12,16 +12,19 @@ function is given as a command. The following options are available: +- -a NAMES or --argument-names NAMES assigns the value of successive command-line arguments to the names given in NAMES. - -d DESCRIPTION or \c --description=DESCRIPTION is a description of what the function does, suitable as a completion description. - -e or --on-event EVENT_NAME tells fish to run this function when the specified named event is emitted. Fish internally generates named events e.g. when showing the prompt. - -j PID or --on-job-exit PID tells fish to run this function when the job with group ID PID exits. Instead of PID, the string 'caller' can be specified. This is only legal when in a command substitution, and will result in the handler being triggered by the exit of the job which created this command substitution. - -p PID or --on-process-exit PID tells fish to run this function when the fish child process with process ID PID exits. - -s or --on-signal SIGSPEC tells fish to run this function when the signal SIGSPEC is delivered. SIGSPEC can be a signal number, or the signal name, such as SIGHUP (or just HUP). +- \c -S or \c --no-scope-shadowing allows the function to access the variables of calling functions. Normally, any variables inside the function that have the same name as variables from the calling function are "shadowed", and their contents is independent of the calling function. - -v or --on-variable VARIABLE_NAME tells fish to run this function when the variable VARIABLE_NAME changes value. If the user enters any additional arguments after the function, they are inserted into the environment variable array -$argv. +$argv. If the \c --argument-names option is provided, the arguments are +also assigned to names specified in that option. By using one of the event handler switches, a function can be made to run automatically at specific events. The user may generate new events using the emit builtin. Fish generates the following named events: diff --git a/doc_src/test.txt b/doc_src/test.txt index 600e7ea78..fc64118e7 100644 --- a/doc_src/test.txt +++ b/doc_src/test.txt @@ -6,37 +6,91 @@ \subsection test-description Description Tests the expression given and sets the exit status to 0 if true, -and 1 if false. +and 1 if false. An expression is made up of one or more operators +and their arguments. -The following options are available: -- \c -h displays a help message and then exits. -- -L FILE returns true if \c FILE is a symbolic link. -- -S FILE returns true if \c FILE is a socket. -- COND1 -a COND2 combines two conditions with a logical and. +The following operators are available to examine files and directories: - -b FILE returns true if \c FILE is a block device. - -c FILE returns true if \c FILE is a character device. - -d FILE returns true if \c FILE is a directory. - -e FILE returns true if \c FILE exists. - -f FILE returns true if \c FILE is a regular file. -- -f FILE returns true if \c FILE has set-group-ID bit set. -- -n STRING returns true if the length of \c STRING is non-zero. -- COND1 -o COND2 combines two conditions with a logical or. +- -g FILE returns true if \c FILE has the set-group-ID bit set. +- -L FILE returns true if \c FILE is a symbolic link. - -p FILE returns true if \c FILE is a named pipe. -- -r FILE returns true if \c FILE is readable. -- -s FILE returns true if the size of \c FILE is non-zero. -- -t FD returns true if \c FD is a terminal (TTY). -- -u FILE returns true if \c FILE has set-user-ID bit set. -- -w FILE returns true if \c FILE is writable. -- -x FILE returns true if \c FILE is executable. -- -z STRING returns true if \c STRING length is zero. +- -r FILE returns true if \c FILE is marked as readable. +- -s FILE returns true if the size of \c FILE is greater than zero. +- -S FILE returns true if \c FILE is a socket. +- -t FD returns true if the file descriptor \c FD is a terminal (TTY). +- -u FILE returns true if \c FILE has the set-user-ID bit set. +- -w FILE returns true if \c FILE is marked as writable; note that this does not check if the filesystem is read-only. +- -x FILE returns true if \c FILE is marked as executable. -\subsection test-example Example +The following operators are available to compare and examine text strings: +- STRING1 = STRING2 returns true if the strings \c STRING1 and +\c STRING2 are identical. +- STRING1 != STRING2 returns true if the strings \c STRING1 and +\c STRING2 are not identical. +- -n STRING returns true if the length of \c STRING is non-zero. +- -z STRING returns true if the length of \c STRING is zero. + +The following operators are available to compare and examine numbers: +- NUM1 -eq NUM2 returns true if \c NUM1 and \c NUM2 are numerically equal. +- NUM1 -ne NUM2 returns true if \c NUM1 and \c NUM2 are not numerically equal. +- NUM1 -gt NUM2 returns true if \c NUM1 is greater than NUM2. +- NUM1 -ge NUM2 returns true if \c NUM1 is greater than or equal to NUM2. +- NUM1 -lt NUM2 returns true if \c NUM1 is less than NUM2. +- NUM1 -le NUM2 returns true if \c NUM1 is less than or equal to NUM2. + +Note that only integers are supported. For more complex mathematical +operations, including fractions, the \c env program may be useful. Consult the +documentation for your operating system. + +Expressions can be combined using the following operators: +- COND1 -a COND2 returns true if both \c COND1 and \c COND2 are true. +- COND1 -o COND2 returns true if either \c COND1 or \c COND2 are true. + +Expressions can be inverted using the \c ! operator: +- ! EXPRESSION returns true if \c EXPRESSION is false, and false if +\c EXPRESSION is true. + +Expressions can be grouped using parentheses. +- ( EXPRESSION ) returns the value of EXPRESSION. +Note that parentheses will usually require escaping with \\( to avoid +being interpreted as a command substitution. + +\subsection test-example Examples + +If the \c /tmp directory exists, copy the \c /etc/motd file to it: 
-if test -d "/"
-    echo "Fish is cool"
+if test -d /tmp
+    cp /etc/motd /tmp/motd
 end
-
+ + +If the variable \c MANPATH is defined and not empty, print the contents: + +
+if test -n $MANPATH
+    echo $MANPATH
+end
+
+ +Parentheses and the \c -o and \c -a operators can be combined to produce +more complicated expressions. In this example, success is printed if there is +a \c /foo or \c /bar file as well as a \c /baz or \c /bat file. + +
+if test \\( -f /foo -o -f /bar \\) -a \\( -f /baz -o -f /bat \\)
+    echo Success.
+end.
+
+ +\subsection test-standards Standards + +\c test implements a subset of the +IEEE Std 1003.1-2008 +(POSIX.1) standard. The following exceptions apply: +- The \c < and \c > operators for comparing strings are not implemented. -Because "/" is a directory, the expression will evaluate to true, and -"Fish is cool" will be output.