changeset 23856:41a0b750c36e

run-octave.in: Don't put +packages in to the PATH variable. Functions in packages are accessed with pkg.function_name. If +pkg directory is added to PATH then namespace doesn't work properly and function_name is already available. * run-octave.in: Use "-name '+*' in FIND expressions to weed out package directories.
author Rik <rik@octave.org>
date Wed, 09 Aug 2017 16:54:14 -0700
parents f9498eb0bbc1
children 4d4ba038d103
files run-octave.in
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/run-octave.in	Wed Aug 09 15:56:29 2017 -0700
+++ b/run-octave.in	Wed Aug 09 16:54:14 2017 -0700
@@ -36,9 +36,9 @@
 d3="$builddir/libinterp"
 d4="$top_srcdir/examples/data"
 
-d1_list=`$FIND "$d1" -type d -a ! \( \( -name private -o -name '@*' -o -name '.deps' -o -name '.libs' \) -a -prune \) -exec echo '{}' ';' | $SED 's/$/:/'`
-d2_list=`$FIND "$d2" -type d -a ! \( \( -name private -o -name '@*' -o -name '.deps' -o -name '.libs' \) -a -prune \) -exec echo '{}' ';' | $SED 's/$/:/'`
-d3_list=`$FIND "$d3" -type d -a ! \( \( -name private -o -name '@*' -o -name '.deps' -o -name '.libs' \) -a -prune \) -exec echo '{}' ';' | $SED 's/$/:/'`
+d1_list=`$FIND "$d1" -type d -a ! \( \( -name private -o -name '@*' -o -name '+*' -o -name '.deps' -o -name '.libs' \) -a -prune \) -exec echo '{}' ';' | $SED 's/$/:/'`
+d2_list=`$FIND "$d2" -type d -a ! \( \( -name private -o -name '@*' -o -name '+*' -o -name '.deps' -o -name '.libs' \) -a -prune \) -exec echo '{}' ';' | $SED 's/$/:/'`
+d3_list=`$FIND "$d3" -type d -a ! \( \( -name private -o -name '@*' -o -name '+*' -o -name '.deps' -o -name '.libs' \) -a -prune \) -exec echo '{}' ';' | $SED 's/$/:/'`
 d4_list=`$FIND "$d4" -type d -exec echo '{}' ';' | $SED 's/$/:/'`
 
 d1_path=`echo "$d1_list" | $AWK '{ t = (s $0); s = t; } END { sub (/:$/, "", s); print s; }'`