perfsonar development work

Author: fernandes
Date: 2007-05-18 12:03:26 -0400 (Fri, 18 May 2007)
New Revision: 2397

Modified:
   trunk/perfsonar-bundle/install.pl
Log:
Removed -q for 'test' actions.
Modified the script to run ant from the ant directory of the service (avoids 
relative paths errors).



Modified: trunk/perfsonar-bundle/install.pl
===================================================================
--- trunk/perfsonar-bundle/install.pl   2007-05-16 15:11:19 UTC (rev 2396)
+++ trunk/perfsonar-bundle/install.pl   2007-05-18 16:03:26 UTC (rev 2397)
@@ -710,7 +710,7 @@
 
     &test();
     if ($answer =~ /^y$/ or $answer =~ /^yes$/){
-        &action('test');
+        &action('test', 1);
     }
 
 }
@@ -748,12 +748,16 @@
 
     switch ($choice){
         case 1      { print "\nExecuting action pre-install...\n\n"; 
&action('pre-install', $verbose); }
-        case 2      { print "\nExecuting action configure...\n\n"; 
&action('configure', $verbose); }
+        case 2      { 
+                      print "\nExecuting action configure...\n\n"; 
+                      if ($service == SSH()){ &action('configure', 1); }
+                      else { &action('configure', $verbose); }
+                    }
         case 3      { 
                       print "\nExecuting action deploy...\n\n"; 
&action('deploy', $verbose); 
                       &copyProperties();  
                     }
-        case 4      { print "\nExecuting action test...\n\n"; 
&action('test', $verbose); }
+        case 4      { print "\nExecuting action test...\n\n"; 
&action('test', 1); }
         case 5      { print "\nExecuting action undeploy...\n\n"; 
&action('undeploy', $verbose); }
         case 6      { 
                       if ($verbose) { $verbose = 0; print "\nVerbose 
installation has been disabled.\n"; }
@@ -772,16 +776,17 @@
     my $target = shift(@_);
     my $notQuiet = shift(@_);
     if (!$isPerl){
+        chdir($installDir."ant");
         if ($notQuiet){
-            $returnCode = system "ant -f " . $installDir . "ant/build.xml " 
. $target;
+            $returnCode = system "ant -f build.xml " . $target;
         }else{
-            $returnCode = system "ant -q -f " . $installDir . "ant/build.xml 
" . $target;
+            $returnCode = system "ant -q -f build.xml " . $target;
         }
     }else{
         chdir($installDir);
         $returnCode = system "perl ".$target;
-        chdir($currentDir);
     }
+    chdir($currentDir);
 }
 
 sub copyProperties(){