perfsonar development work

Author: fernandes
Date: 2007-12-05 12:02:47 -0500 (Wed, 05 Dec 2007)
New Revision: 3094

Modified:
   trunk/perfsonar-bundle/install.pl
Log:
Bundle installer update to accomodate services that dont use the perfsonar 
directory in installation tarball.



Modified: trunk/perfsonar-bundle/install.pl
===================================================================
--- trunk/perfsonar-bundle/install.pl   2007-12-05 15:25:03 UTC (rev 3093)
+++ trunk/perfsonar-bundle/install.pl   2007-12-05 17:02:47 UTC (rev 3094)
@@ -621,7 +621,7 @@
                        }
 
                        if ( !$isPerl ) {
-                               if ( !( $installDir =~ /perfsonar\/$/ ) ) {
+                               if ( !( $installDir =~ /perfsonar\/$/ ) &&  
system( "test -d " . $installDir . "perfsonar" ) == 0 ) {
                                        $installDir .= 'perfsonar/';
                                }
 
@@ -733,7 +733,7 @@
 
        $file =~ s/\.tar.*//;
        $installDir .= $file . "/";
-       if ( !$isPerl ) {
+       if ( !$isPerl &&  system( "test -d " . $installDir . "perfsonar" ) == 
0) {
                $installDir .= "perfsonar/";
        }
 
@@ -778,10 +778,12 @@
 }
 
 sub detectExistingInstall() {
+    my @dirs2;
        my @perl;
        my @confSD;
        @dirs =
 `find $currentDir -type d | grep 
".*$serviceMap{$service}.*/perfsonar/ant\$"`;
+    @dirs2 = `find $currentDir -type d | grep 
".*$serviceMap{$service}.*/ant\$"`;
        @perl = `find $currentDir | egrep 
".*$serviceMap{$service}.*/pre-install(.pl)?\$"`;
     if(system("test -f .install.conf") != 0){
        system("touch .install.conf 2>&1 >> /dev/null");
@@ -789,6 +791,7 @@
        @confSD =
          `cat .install.conf | grep $serviceMap{$service} | cut -d "=" -f 2`;
        chomp(@perl);
+       push( @dirs, @dirs2 );
        push( @dirs, @perl );
        push( @dirs, @confSD );
        if ( scalar(@dirs) > 0 ) { return 'true' }