Revision: 590
http://assorted.svn.sourceforge.net/assorted/?rev=590&view=rev
Author: yangzhang
Date: 2008-03-03 15:39:27 -0800 (Mon, 03 Mar 2008)
Log Message:
-----------
fixes and updates; works on josmp.csail
Modified Paths:
--------------
configs/trunk/bootstrap.bash
Modified: configs/trunk/bootstrap.bash
===================================================================
--- configs/trunk/bootstrap.bash 2008-03-03 23:39:00 UTC (rev 589)
+++ configs/trunk/bootstrap.bash 2008-03-03 23:39:27 UTC (rev 590)
@@ -66,6 +66,7 @@
prefix=~/.local; \
pkg="$prefix/pkg"; \
armed="$prefix/armed"; \
+ export PATH="$prefix/armed/bin:$HOME/.toast/armed/bin:$PATH"
;;
* ) echo "must specify global or local" ; exit 1 ;;
esac
@@ -79,14 +80,18 @@
type wget
! use_sudo || type sudo
-python -c "
+if use_sudo ; then
+ python -c "
import pwd, sys
try: pwd.getpwnam('$pkg_user')
except: print >> sys.stderr, 'you must add user: $pkg_user'; sys.exit(1)
"
+fi
dosu mkdir -p "$armed"
-dosu chown pkg "$armed"
+if use_sudo
+then dosu chown pkg "$armed"
+fi
# cd into the current directory, set locations
@@ -122,10 +127,11 @@
# setup latest bash to avoid major bugs (like segfaults interpreting this script!)
-ver="$( bash --version | grep ' version ' | sed 's/.* version //' )"
-if [[ "$ver" < '3.2' ]] ; then
+# ver="$( bash --version | grep ' version ' | sed 's/.* version //' )"
+if [[ "$BASH_VERSION" < '3.2' ]] ; then
dosu toast arm bash
- bash "$@"
+ hash bash
+ bash "$0" "$@"
fi
# setup gnu coreutils
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
