# HG changeset patch # User Mike Miller # Date 1439075623 14400 # Node ID a63f9cb609a1d7422999b0836c33f0ab00b98e80 # Parent 9c7dd58b57e4dd6b476a796c170d4fb81a0c4d02 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. diff -r 9c7dd58b57e4 -r a63f9cb609a1 run-octave.in --- 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 ## . -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" "$@"