diff options
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/profile.jogl | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/etc/profile.jogl b/etc/profile.jogl index 413c0538d..16b3a3db0 100755 --- a/etc/profile.jogl +++ b/etc/profile.jogl @@ -7,15 +7,15 @@ function print_usage() function concat_jogl_list() { - ITEMDIR=$1 + ITEMDIR="$1" shift - for j in $ITEMDIR $ITEMDIR/jar ; do + for j in "$ITEMDIR" "$ITEMDIR"/jar ; do for i in $* ; do - if [ -e $j/$i ] ; then + if [ -e "$j"/$i ] ; then if [ -z "$JOGL_LIST" ] ; then - JOGL_LIST=$j/$i + JOGL_LIST="$j"/$i else - JOGL_LIST=$JOGL_LIST:$j/$i + JOGL_LIST="$JOGL_LIST":"$j"/$i fi fi done @@ -68,23 +68,23 @@ AUTOBUILD=0 if [ ! -z "$JOGL_BUILD_DIR" -a -e "$JOGL_BUILD_DIR" ] ; then AUTOBUILD=0 -elif [ -e $THISDIR/jar ] ; then +elif [ -e "$THISDIR"/jar ] ; then # Autobuild - JOGL_BUILD_DIR=$THISDIR/jar + JOGL_BUILD_DIR="$THISDIR"/jar AUTOBUILD=1 else - echo invalid JOGL_BUILD_DIR $JOGL_BUILD_DIR and no AUTOBUILD + echo invalid JOGL_BUILD_DIR "$JOGL_BUILD_DIR" and no AUTOBUILD print_usage fi export JOGL_BUILD_DIR -JOGL_LIB_DIR=$JOGL_BUILD_DIR/lib +JOGL_LIB_DIR="$JOGL_BUILD_DIR"/lib export JOGL_LIB_DIR -JOGL_ALL_AWT_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL $JOGL_TEST) -JOGL_ALL_NOAWT_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL_NOAWT $JOGL_TEST) -JOGL_MOBILE_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL_MOBILE $JOGL_TEST) -JOGL_SWT_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_SWT $JOGL_TEST) +JOGL_ALL_AWT_CLASSPATH=$(concat_jogl_list "$JOGL_BUILD_DIR" $JOGL_JAR_ALL $JOGL_TEST) +JOGL_ALL_NOAWT_CLASSPATH=$(concat_jogl_list "$JOGL_BUILD_DIR" $JOGL_JAR_ALL_NOAWT $JOGL_TEST) +JOGL_MOBILE_CLASSPATH=$(concat_jogl_list "$JOGL_BUILD_DIR" $JOGL_JAR_ALL_MOBILE $JOGL_TEST) +JOGL_SWT_CLASSPATH=$(concat_jogl_list "$JOGL_BUILD_DIR" $JOGL_JAR_SWT $JOGL_TEST) export JOGL_ALL_AWT_CLASSPATH JOGL_ALL_NOAWT_CLASSPATH JOGL_MOBILE_CLASSPATH JOGL_SWT_CLASSPATH if [ ! -z "$JOGL_PROFILE" ] ; then |