Changeset 1743

Timestamp:

2000-12-05T15:56:25+13:00 (23 years ago)

Author:

sjboddie

Message:

Had a bit of a go at getting the building code to build from http and
ftp addresses on windows. There's still a bit of an issue with the way
wget handles windows file paths but the perl code is all done I think

Location:

trunk/gsdl/bin/script

Files:

• build (modified) (2 diffs)
• gsWget.pl (modified) (1 diff)

trunk/gsdl/bin/script/build

@@ -160 +160 @@
         #  -o = the output file to write download status to (only used if the -out
         #       option was given to build)
+
         my $download_cmd = "perl -S gsWget.pl -P \"$importdir\" -np -nv";
-        $download .= " -r -N -l inf -R \"*\?*\"";
+        $download_cmd .= " -r -N -l inf -R \"*\?*\"";
         $download_cmd .= " -o \"$outfile.download\"" if $use_out;
         $download_cmd .= " \"$download_dir\"";
@@ -181 +182 @@
                 last;
             } else {
-                $file = &util:filename_cat ($importdir, $file);
+                $file = &util::filename_cat ($importdir, $file);
                 if (-d $file) {
                 if (opendir (DIR, $file)) {
-                    my @2files = readdir DIR;
+                    my @files2 = readdir DIR;
                     closedir DIR;
-                    foreach my $2file (@2files) {
-                    if ($2file =~ /^robots.txt$/i) {
-                        &util::rm (&util::filename_cat ($file, $2file));
+                    foreach my $file2 (@files2) {
+                    if ($file2 =~ /^robots.txt$/i) {
+                        &util::rm (&util::filename_cat ($file, $file2));
                         last;
                     }

trunk/gsdl/bin/script/gsWget.pl

@@ -31 +31 @@
 BEGIN {
     die "GSDLHOME not set\n" unless defined $ENV{'GSDLHOME'};
+    die "GSDLOS not set\n" unless defined $ENV{'GSDLOS'};
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
 }
 
-# use version of wet in packages directory if it exists
-my $cmd = "$ENV{'GSDLHOME'}/packages/wget/bin/wget";
+use util;
+
+# wget should live in the Greenstone directory structure
+# we'll bail if we can't find it
+my $exe = &util::get_os_exe ();
+my $cmd = &util::filename_cat ($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}, "wget");
+$cmd .= $exe;
 if (! -e "$cmd") {
-    $cmd = "wget";
+    die "gsWget.pl failed: $cmd doesn't exist\n";
 }