perfsonar development work

Author: fernandes
Date: 2007-08-14 11:46:20 -0400 (Tue, 14 Aug 2007)
New Revision: 2656

Modified:
   trunk/perfsonar-bundle/install.pl
Log:
Fixed bug for Solaris find command.



Modified: trunk/perfsonar-bundle/install.pl
===================================================================
--- trunk/perfsonar-bundle/install.pl   2007-08-14 13:36:20 UTC (rev 2655)
+++ trunk/perfsonar-bundle/install.pl   2007-08-14 15:46:20 UTC (rev 2656)
@@ -531,11 +531,11 @@
 sub detectExistingService() {
        my @perl;
        my $i;
-       @dirs = `find $webappsDir -type d -regex ".*WEB-INF\$"`;
+       @dirs = `find $webappsDir -type d -name "WEB-INF"`;
        for ( $i = 0 ; $i < scalar(@dirs) ; $i++ ) {
                $dirs[$i] =~ s/\/WEB-INF//;
        }
-       @perl = `find $webappsDir -type d -regex ".*bin\$"`;
+       @perl = `find $webappsDir -type d -name "bin"`;
        for ( $i = 0 ; $i < scalar(@perl) ; $i++ ) {
                $perl[$i] =~ s/\/bin//;
        }
@@ -548,7 +548,7 @@
 sub detectWebapps() {
        my @confSD;
        @dirs =
-         `find $currentDir -type d -regex ".*webapps\$" | grep -v 
apache-tomcat`;
+         `find $currentDir -type d -name "webapps" | grep -v apache-tomcat`;
        @confSD = `cat .install.conf | grep webapps | cut -d "=" -f 2`;
        push( @dirs, @confSD );
        chomp(@dirs);
@@ -780,8 +780,8 @@
        my @perl;
        my @confSD;
        @dirs =
-`find $currentDir -type d -regex 
".*$serviceMap{$service}.*/perfsonar/ant\$"`;
-       @perl = `find $currentDir -regex 
".*$serviceMap{$service}.*/pre-install\\(.pl\\)?\$"`;
+`find $currentDir -type d | grep 
".*$serviceMap{$service}.*/perfsonar/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");
     }