Changeset 13012

Timestamp:

2006-10-05T16:51:22+13:00 (18 years ago)

Author:

mdewsnip

Message:

Changed to find wget in GSDLHOME/bin/GSDLOS.

File:

• trunk/gsdl/perllib/downloaders/WgetDownload.pm (modified) (1 diff)

trunk/gsdl/perllib/downloaders/WgetDownload.pm

@@ -128 +128 @@
     my ($self, $cmdWget,$blnShow) = @_;
 
-    my ($os,$strReadIn,$strLine,$command);
+    my ($strReadIn,$strLine,$command);
     $strReadIn = "" unless defined $strReadIn;
-    
-    $os = $ENV{'GSDLOS'};
- 
-  
-    if ($os =~ /windows/i){
-    $command = "\"$ENV{'GSDLHOME'}\\bin\\windows\\wget\" $cmdWget |";
-    }
-    else{
-        $command = "$ENV{'GSDLHOME'}/packages/wget/wget-1.9/src/wget $cmdWget |";  
-    }
 
-    
+    my $wget_file_path = &util::filename_cat($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}, "wget");
+    $command = "\"$wget_file_path\" $cmdWget |";
 
-   open(*WIN,$command) || die "wget request failed: $!\n";
-
-    
+    open(*WIN,$command) || die "wget request failed: $!\n";
 
     while (defined($strLine=<WIN>))
     {
-
-
     if($blnShow)
     {