Mercurial > octave-nkf
changeset 20465:a63f9cb609a1
run-octave: Use portable shell constructs
* run-octave.in: Allow AWK, FIND, and SED to be set from the environment.
Set OCTAVE_* environment variables portably before running interpreter.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Sat, 08 Aug 2015 19:13:43 -0400 |
| parents | 9c7dd58b57e4 |
| children | a76e20f2f156 |
| files | run-octave.in |
| diffstat | 1 files changed, 15 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/run-octave.in Thu Aug 06 08:37:02 2015 -0700 +++ b/run-octave.in Sat Aug 08 19:13:43 2015 -0400 @@ -20,9 +20,9 @@ ## along with Octave; see the file COPYING. If not, see ## <http://www.gnu.org/licenses/>. -AWK=%AWK% -FIND=%FIND% -SED=%SED% +: ${AWK=%AWK%} +: ${FIND=%FIND%} +: ${SED=%SED%} # FIXME -- is there a better way to handle the possibility of spaces # in these names? @@ -89,14 +89,15 @@ ## need Octave to find other things in ARCHLIBDIR that are not built ## in the $builddir/src directory. -OCTAVE_BINDIR="$builddir/src" \ -OCTAVE_ARCHLIBDIR="$builddir/src" \ -OCTAVE_SITE_INITFILE="$top_srcdir/scripts/startup/main-rcfile" \ -OCTAVE_DEFAULT_QT_SETTINGS="$builddir/libgui/default-qt-settings" \ -OCTAVE_LOCALE_DIR="$builddir/libgui/languages" \ -OCTAVE_JAVA_DIR="$builddir/scripts/java" \ - exec $builddir/libtool --mode=execute $driver \ - "$octave_executable" --no-init-path --path="$LOADPATH" \ - --image-path="$IMAGEPATH" --doc-cache-file="$DOCFILE" \ - --built-in-docstrings-file="$BUILT_IN_DOCSTRINGS_FILE" \ - --texi-macros-file="$TEXIMACROSFILE" --info-file="$INFOFILE" "$@" +OCTAVE_ARCHLIBDIR="$builddir/src"; export OCTAVE_ARCHLIBDIR +OCTAVE_BINDIR="$builddir/src"; export OCTAVE_BINDIR +OCTAVE_DEFAULT_QT_SETTINGS="$builddir/libgui/default-qt-settings"; export OCTAVE_DEFAULT_QT_SETTINGS +OCTAVE_JAVA_DIR="$builddir/scripts/java"; export OCTAVE_JAVA_DIR +OCTAVE_LOCALE_DIR="$builddir/libgui/languages"; export OCTAVE_LOCALE_DIR +OCTAVE_SITE_INITFILE="$top_srcdir/scripts/startup/main-rcfile"; export OCTAVE_SITE_INITFILE + +exec $builddir/libtool --mode=execute $driver \ + "$octave_executable" --no-init-path --path="$LOADPATH" \ + --image-path="$IMAGEPATH" --doc-cache-file="$DOCFILE" \ + --built-in-docstrings-file="$BUILT_IN_DOCSTRINGS_FILE" \ + --texi-macros-file="$TEXIMACROSFILE" --info-file="$INFOFILE" "$@"