[Bps-public-commit] Shipwright branch, master, updated. 7a123a8eb6d79e24c1a763484ba612e59826dddf

? sunnavy sunnavy at bestpractical.com
Tue May 18 09:03:35 EDT 2010


The branch, master has been updated
       via  7a123a8eb6d79e24c1a763484ba612e59826dddf (commit)
      from  01a7c68cde2159532e9f35c586550f9084bed272 (commit)

Summary of changes:
 share/bin/shipwright-builder |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit 7a123a8eb6d79e24c1a763484ba612e59826dddf
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue May 18 21:03:50 2010 +0800

    symlink path fix

diff --git a/share/bin/shipwright-builder b/share/bin/shipwright-builder
index 8e81a86..5b68990 100755
--- a/share/bin/shipwright-builder
+++ b/share/bin/shipwright-builder
@@ -574,7 +574,7 @@ sub wrap_bin {
         $tmp =~ s/\Q$args{'install-base'}\E//g;
         my $wrapped_depth =
           scalar( splitdir($File::Find::dir) ) -
-          scalar( splitdir( $args{'install-base'} ) ) - 2;
+          scalar( splitdir( $args{'install-base'} ) );
 
         mkdir $wrap_dir unless -d $wrap_dir;
 
@@ -611,14 +611,14 @@ sub wrap_bin {
             )
           )
         {
-            symlink catfile( ('..') x $wrapped_depth,
-                'etc', "shipwright-$type-wrapper" ) => $wrap_file
+            symlink catfile( '..', 'etc', "shipwright-$type-wrapper" ) =>
+              $wrap_file
               or confess $!;
         }
         else {
 
-            symlink catfile( ('..') x $wrapped_depth,
-                'etc', 'shipwright-script-wrapper' ) => $wrap_file
+            symlink catfile( '..', 'etc', 'shipwright-script-wrapper' ) =>
+              $wrap_file
               or confess $!;
         }
         chmod oct 755, $wrap_file;

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



More information about the Bps-public-commit mailing list