[Bps-public-commit] Shipwright branch, master, updated. 0b96adb3e805986c4ac12934cb7c3a760f9df428

[sunnavy at bestpractical.com]

The branch, master has been updated
       via  0b96adb3e805986c4ac12934cb7c3a760f9df428 (commit)
       via  b99c80cbd35a94f389e4cbacf1eef12080ceb719 (commit)
      from  825fcb3bfcfc31e3e9782b1818049517509de719 (commit)

Summary of changes:
 share/etc/shipwright-perl-wrapper   |    2 +-
 share/etc/shipwright-script-wrapper |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit b99c80cbd35a94f389e4cbacf1eef12080ceb719
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Oct 21 10:24:37 2009 +0800

    fix the check if realink exists way on solaris

diff --git a/share/etc/shipwright-perl-wrapper b/share/etc/shipwright-perl-wrapper
index ce67f18..0b08466 100755
--- a/share/etc/shipwright-perl-wrapper
+++ b/share/etc/shipwright-perl-wrapper
@@ -1,5 +1,5 @@
 #!/bin/sh
-if [ -z `which readlink` ]; then  
+if [ -z `which readlink` ] || [ "`which readlink | grep 'no readlink in'`" ]; then  
     # if we don't have readlink, we're on some pitiful platform like solaris
     test -h $0 && LINK=`ls -l $0 | awk -F\>  '{print $NF}'`
 else
diff --git a/share/etc/shipwright-script-wrapper b/share/etc/shipwright-script-wrapper
index 9c66a5a..b7e1b07 100755
--- a/share/etc/shipwright-script-wrapper
+++ b/share/etc/shipwright-script-wrapper
@@ -1,5 +1,5 @@
 #!/bin/sh
-if [ -z `which readlink` ]; then  
+if [ -z `which readlink` ] || [ "`which readlink | grep 'no readlink in'`" ]; then  
     # if we don't have readlink, we're on some pitiful platform like solaris
     test -h $0 && LINK=`ls -l $0 | awk -F\>  '{print $NF}'`
 else

commit 0b96adb3e805986c4ac12934cb7c3a760f9df428
Merge: b99c80c 825fcb3
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Oct 21 10:25:19 2009 +0800

    Merge branch 'master' of code.bestpractical.com:/git/shipwright


-----------------------------------------------------------------------