[Bps-public-commit] rt-shipwright branch, master, updated. ef759e2e104f8d1f66a570c9b643f4c63113ba14

[? sunnavy]

The branch, master has been updated
       via  ef759e2e104f8d1f66a570c9b643f4c63113ba14 (commit)
      from  ed21e256990c6b52a529b2c886625b15b5f1a9c5 (commit)

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

- Log -----------------------------------------------------------------
commit ef759e2e104f8d1f66a570c9b643f4c63113ba14
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Jul 1 08:48:29 2010 +0800

    update wrapper

diff --git a/3.8.8/etc/shipwright-perl-wrapper b/3.8.8/etc/shipwright-perl-wrapper
index 0b08466..7feb1e8 100755
--- a/3.8.8/etc/shipwright-perl-wrapper
+++ b/3.8.8/etc/shipwright-perl-wrapper
@@ -1,7 +1,7 @@
 #!/bin/sh
 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}'`
+    test -h $0 && LINK=`ls -l $0 | awk -F\>  '{print $NF}' | sed -e 's/^ //'`
 else
     LINK=`readlink $0`
 fi
@@ -21,19 +21,21 @@ if [ "$LINK" = '' ] || [ $LINK = '../etc/shipwright-perl-wrapper' ] || [ $LINK =
         PARENT_BASE_DIR=` (cd "$BASE_DIR/.."; pwd) `
         PARENT_WRAPPED_DIR=`basename "$PARENT_BASE_DIR"`
         WRAPPED_DIR="$PARENT_WRAPPED_DIR/$WRAPPED_DIR"
-        PATH=${BASE_DIR}/../../sbin:${BASE_DIR}/../../bin:${BASE_DIR}/../sbin:${BASE_DIR}/../bin:$PATH \
-        SHIPWRIGHT_PERL=$BASE_DIR/../../bin/perl \
-        PERL5LIB=${BASE_DIR}/../../lib/perl5/site_perl:${BASE_DIR}/../../lib/perl5:${PERL5LIB}\
-            LD_LIBRARY_PATH=${BASE_DIR}/../../lib:${LD_LIBRARY_PATH}\
-            DYLD_LIBRARY_PATH=${BASE_DIR}/../../lib:${DYLD_LIBRARY_PATH}\
-            exec ${BASE_DIR}/../../as/$AS/bin/perl ${BASE_DIR}/../../as/$AS/${WRAPPED_DIR}/${FILENAME}  "$@"
+        PATH=${BASE_DIR}/../../sbin:${BASE_DIR}/../../bin:${BASE_DIR}/../sbin:${BASE_DIR}/../bin:$PATH
+        SHIPWRIGHT_PERL=$BASE_DIR/../../bin/perl
+        PERL5LIB=${BASE_DIR}/../../lib/perl5/site_perl:${BASE_DIR}/../../lib/perl5:${PERL5LIB}
+        LD_LIBRARY_PATH=${BASE_DIR}/../../lib:${LD_LIBRARY_PATH}
+        DYLD_LIBRARY_PATH=${BASE_DIR}/../../lib:${DYLD_LIBRARY_PATH}
+        export PATH SHIPWRIGHT_PERL PERL5LIB LD_LIBRARY_PATH DYLD_LIBRARY_PATH
+        exec ${BASE_DIR}/../../as/$AS/bin/perl ${BASE_DIR}/../../as/$AS/${WRAPPED_DIR}/${FILENAME}  "$@"
     else
-        PATH=${BASE_DIR}/../sbin:${BASE_DIR}/../bin:${BASE_DIR}/../usr/sbin:${BASE_DIR}/../usr/bin:$PATH \
-        SHIPWRIGHT_PERL=$BASE_DIR/../bin/perl \
-        PERL5LIB=${BASE_DIR}/../lib/perl5/site_perl:${BASE_DIR}/../lib/perl5:${PERL5LIB}\
-            LD_LIBRARY_PATH=${BASE_DIR}/../lib:${LD_LIBRARY_PATH}\
-            DYLD_LIBRARY_PATH=${BASE_DIR}/../lib:${DYLD_LIBRARY_PATH}\
-            exec ${BASE_DIR}/../as/$AS/bin/perl ${BASE_DIR}/../as/$AS/${WRAPPED_DIR}/${FILENAME}  "$@"
+        PATH=${BASE_DIR}/../sbin:${BASE_DIR}/../bin:${BASE_DIR}/../usr/sbin:${BASE_DIR}/../usr/bin:$PATH
+        SHIPWRIGHT_PERL=$BASE_DIR/../bin/perl
+        PERL5LIB=${BASE_DIR}/../lib/perl5/site_perl:${BASE_DIR}/../lib/perl5:${PERL5LIB}
+        LD_LIBRARY_PATH=${BASE_DIR}/../lib:${LD_LIBRARY_PATH}
+        DYLD_LIBRARY_PATH=${BASE_DIR}/../lib:${DYLD_LIBRARY_PATH}
+        export PATH SHIPWRIGHT_PERL PERL5LIB LD_LIBRARY_PATH DYLD_LIBRARY_PATH
+        exec ${BASE_DIR}/../as/$AS/bin/perl ${BASE_DIR}/../as/$AS/${WRAPPED_DIR}/${FILENAME}  "$@"
     fi
 else
     exec $LINK "$@"
diff --git a/3.8.8/etc/shipwright-script-wrapper b/3.8.8/etc/shipwright-script-wrapper
index b7e1b07..43bd710 100755
--- a/3.8.8/etc/shipwright-script-wrapper
+++ b/3.8.8/etc/shipwright-script-wrapper
@@ -1,7 +1,7 @@
 #!/bin/sh
 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}'`
+    test -h $0 && LINK=`ls -l $0 | awk -F\>  '{print $NF}' | sed -e 's/^ //'`
 else
     LINK=`readlink $0`
 fi
@@ -19,17 +19,19 @@ if [ "$LINK" = '' ] || [ $LINK = '../etc/shipwright-script-wrapper' ] || [ $LINK
         PARENT_BASE_DIR=` (cd "$BASE_DIR/.."; pwd) `
         PARENT_WRAPPED_DIR=`basename "$PARENT_BASE_DIR"`
         WRAPPED_DIR="$PARENT_WRAPPED_DIR/$WRAPPED_DIR"
-        PATH=${BASE_DIR}/../../sbin:${BASE_DIR}/../../bin:${BASE_DIR}/../sbin:${BASE_DIR}/../bin:$PATH \
-        PERL5LIB=${BASE_DIR}/../../lib/perl5/site_perl:${BASE_DIR}/../../lib/perl5:${PERL5LIB}\
-            LD_LIBRARY_PATH=${BASE_DIR}/../../lib:${LD_LIBRARY_PATH}\
-            DYLD_LIBRARY_PATH=${BASE_DIR}/../../lib:${DYLD_LIBRARY_PATH}\
-            exec ${BASE_DIR}/../../as/$AS/${WRAPPED_DIR}/${FILENAME}  "$@"
+        PATH=${BASE_DIR}/../../sbin:${BASE_DIR}/../../bin:${BASE_DIR}/../sbin:${BASE_DIR}/../bin:$PATH 
+        PERL5LIB=${BASE_DIR}/../../lib/perl5/site_perl:${BASE_DIR}/../../lib/perl5:${PERL5LIB}
+        LD_LIBRARY_PATH=${BASE_DIR}/../../lib:${LD_LIBRARY_PATH}
+        DYLD_LIBRARY_PATH=${BASE_DIR}/../../lib:${DYLD_LIBRARY_PATH}
+        export PATH PERL5LIB LD_LIBRARY_PATH DYLD_LIBRARY_PATH
+        exec ${BASE_DIR}/../../as/$AS/${WRAPPED_DIR}/${FILENAME}  "$@"
     else
-        PATH=${BASE_DIR}/../sbin:${BASE_DIR}/../bin:${BASE_DIR}/../usr/sbin:${BASE_DIR}/../usr/bin:$PATH \
-        PERL5LIB=${BASE_DIR}/../lib/perl5/site_perl:${BASE_DIR}/../lib/perl5:${PERL5LIB}\
-            LD_LIBRARY_PATH=${BASE_DIR}/../lib:${LD_LIBRARY_PATH}\
-            DYLD_LIBRARY_PATH=${BASE_DIR}/../lib:${DYLD_LIBRARY_PATH}\
-            exec ${BASE_DIR}/../as/$AS/${WRAPPED_DIR}/${FILENAME}  "$@"
+        PATH=${BASE_DIR}/../sbin:${BASE_DIR}/../bin:${BASE_DIR}/../usr/sbin:${BASE_DIR}/../usr/bin:$PATH
+        PERL5LIB=${BASE_DIR}/../lib/perl5/site_perl:${BASE_DIR}/../lib/perl5:${PERL5LIB}
+        LD_LIBRARY_PATH=${BASE_DIR}/../lib:${LD_LIBRARY_PATH}
+        DYLD_LIBRARY_PATH=${BASE_DIR}/../lib:${DYLD_LIBRARY_PATH}
+        export PATH PERL5LIB LD_LIBRARY_PATH DYLD_LIBRARY_PATH
+        exec ${BASE_DIR}/../as/$AS/${WRAPPED_DIR}/${FILENAME}  "$@"
     fi
 else
     exec $LINK "$@"

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