|
|
Author: eliot
Date: 2011-10-19 11:52:10 -0700 (Wed, 19 Oct 2011)
New Revision: 2502
Modified:
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
branches/Cog/platforms/unix/config/bin.squeak.sh.in
branches/Cog/platforms/unix/config/squeak.sh.in
Log:
Ensure the unix run scripts set SQUEAK_PLUGINS if unset.
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Wed Oct 19 11:05:54 PDT 2011
+ Wed Oct 19 11:51:32 PDT 2011
Modified: branches/Cog/platforms/unix/config/bin.squeak.sh.in
===================================================================
--- branches/Cog/platforms/unix/config/bin.squeak.sh.in 2011-10-19 18:07:48 UTC (rev 2501)
+++ branches/Cog/platforms/unix/config/bin.squeak.sh.in 2011-10-19 18:52:10 UTC (rev 2502)
@@ -1,5 +1,10 @@
#!/bin/sh
+# Run the VM, setting SQUEAK_PLUGINS if unset to the VM's containing directory
+# if unset, and ensuring LD_LIBRARY_PATH includes the VM's containing directory.
BIN=`/usr/bin/dirname $0`/../@expanded_relative_imgdir@
+if [ "${SQUEAK_PLUGINS-unset}" = unset ]; then
+ export SQUEAK_PLUGINS="$BIN"
+fi
# At least on linux LD_LIBRARY_PATH's components must be absolute path names
case "$BIN" in
/*) PLUGINS="$BIN";;
Modified: branches/Cog/platforms/unix/config/squeak.sh.in
===================================================================
--- branches/Cog/platforms/unix/config/squeak.sh.in 2011-10-19 18:07:48 UTC (rev 2501)
+++ branches/Cog/platforms/unix/config/squeak.sh.in 2011-10-19 18:52:10 UTC (rev 2502)
@@ -1,5 +1,10 @@
#!/bin/sh
+# Run the VM, setting SQUEAK_PLUGINS if unset to the VM's containing directory
+# if unset, and ensuring LD_LIBRARY_PATH includes the VM's containing directory.
BIN=`/usr/bin/dirname $0`/@expanded_relative_imgdir@
+if [ "${SQUEAK_PLUGINS-unset}" = unset ]; then
+ export SQUEAK_PLUGINS="$BIN"
+fi
# At least on linux LD_LIBRARY_PATH's components must be absolute path names
case "$BIN" in
/*) PLUGINS="$BIN";;
|
Locked
