Merge branch 'release/20180719'

.gitignore

@@ -3,6 +3,7 @@ Makefile
 autom4te.cache
 config.log
 config.status
+local.env
 release-checklist.txt
 shell-toolbox-*.tar.gz
 src/shell

INSTALL

@@ -1,48 +1,60 @@
-This project uses GNU autotools.
-
-To install the scripts under "/usr/local" (scripts will always go in the
-"bin" subdirectory):
-
-    ./configure
-    make
-    make install
-
-Then make sure that "/usr/local/bin" is in your "$PATH".
-
-To install under "$HOME/local":
-
-    ./configure --prefix="$HOME/local"
-    make
-    make install
-
-To install using GNU Stow under "$HOME/local":
-
-    ./configure --prefix="$HOME/local/stow/shell-toolbox"
-    make
-    make install
-    cd "$HOME/local/stow"
-    stow shell-toolbox
-
-Then make sure that "$HOME/local/bin" is in your "$PATH".
-
-The following files will be installed unless the default installation
-paths are modified:
-
-    <prefix>
-    |-- bin
-    |   `-- shell
-    `-- share
-        |-- doc
-        |   `-- shell-toolbox
-        |       |-- LICENSE
-        |       |-- NEWS
-        |       |-- README
-        |       |-- shell.md
-        |       `-- shell.txt
-        `-- man
-            `-- man1
-                `-- shell.1
-
-Caveat: If you run "make distclean", the generated manuals, which are
-part of the distribution sources, will be removed.  These won't be
-rebuilt unless you have mandoc(1) installed.
+1. Installing from the distribution tar archive or a GitHub clone:
+
+    This project uses GNU autotools.
+
+    To install the scripts under "/usr/local" (scripts will always go in
+    the "bin" subdirectory):
+
+        ./configure
+        make
+        make install
+
+    Then make sure that "/usr/local/bin" is in your "$PATH".
+
+    To install under "$HOME/local":
+
+        ./configure --prefix="$HOME/local"
+        make
+        make install
+
+    To install using GNU Stow under "$HOME/local":
+
+        ./configure --prefix="$HOME/local/stow/shell-toolbox"
+        make
+        make install
+        cd "$HOME/local/stow"
+        stow shell-toolbox
+
+    Then make sure that "$HOME/local/bin" is in your "$PATH".
+
+    The following files will be installed unless the default
+    installation paths are modified:
+
+        <prefix>
+        |-- bin
+        |   `-- shell
+        `-- share
+            |-- doc
+            |   `-- shell-toolbox
+            |       |-- LICENSE
+            |       |-- NEWS
+            |       |-- README
+            |       |-- shell.md
+            |       `-- shell.txt
+            `-- man
+                `-- man1
+                    `-- shell.1
+
+    Caveat: If you run "make distclean", the generated manuals, which
+    are part of the distribution sources, will be removed.  These won't
+    be rebuilt unless you have mandoc(1) installed.
+
+2. Installing on FreeBSD:
+
+    The devel/shell-toolbox port:
+
+        cd /usr/ports/devel/shell-toolbox/ && make install clean
+
+    The shell-toolbox package:
+
+        pkg install shell-toolbox

Makefile.in

@@ -252,7 +252,6 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANDOC = @MANDOC@
-MANDOC_DOES_MARKDOWN = @MANDOC_DOES_MARKDOWN@
 MKDIR_P = @MKDIR_P@
 MKTEMP = @MKTEMP@
 MKTEMP_TEMPLATE = @MKTEMP_TEMPLATE@

NEWS

@@ -1,3 +1,11 @@
+Release 20180719
+    * A skeleton directory (to pre-populate the temporary working
+      directory with) may be specified by setting the SHELL_SKEL
+      environment variable to the path of a directory.  This environment
+      variable is not used if the command line option -s or -d is used.
+    * /bin/sh is used if SHELL is empty or unset and no other shell is
+      specified.
+
 Release 20180422
     * Added NEWS file.
     * Added -q option for quiet operation.

TODO

@@ -2,4 +2,6 @@
       This will not happen until the toolbox contains more than a single
       script.
 
+    * Write the shell code formatter script/program.
+
     * shell:    Nothing at the moment.

aclocal.m4

@@ -108,6 +108,43 @@ AC_DEFUN([AM_AUX_DIR_EXPAND],
 am_aux_dir=`cd "$ac_aux_dir" && pwd`
 ])
 
+# AM_COND_IF                                            -*- Autoconf -*-
+
+# Copyright (C) 2008-2018 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_COND_IF
+# _AM_COND_ELSE
+# _AM_COND_ENDIF
+# --------------
+# These macros are only used for tracing.
+m4_define([_AM_COND_IF])
+m4_define([_AM_COND_ELSE])
+m4_define([_AM_COND_ENDIF])
+
+# AM_COND_IF(COND, [IF-TRUE], [IF-FALSE])
+# ---------------------------------------
+# If the shell condition COND is true, execute IF-TRUE, otherwise execute
+# IF-FALSE.  Allow automake to learn about conditional instantiating macros
+# (the AC_CONFIG_FOOS).
+AC_DEFUN([AM_COND_IF],
+[m4_ifndef([_AM_COND_VALUE_$1],
+	   [m4_fatal([$0: no such condition "$1"])])dnl
+_AM_COND_IF([$1])dnl
+if test -z "$$1_TRUE"; then :
+  m4_n([$2])[]dnl
+m4_ifval([$3],
+[_AM_COND_ELSE([$1])dnl
+else
+  $3
+])dnl
+_AM_COND_ENDIF([$1])dnl
+fi[]dnl
+])
+
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
 # Copyright (C) 1997-2018 Free Software Foundation, Inc.