Changeset 1507 for trunk/gsdl/bin/script/build

Timestamp:

2000-09-06T14:14:46+12:00 (24 years ago)

Author:

sjboddie

Message:

More minor changes to the collector

File:

• trunk/gsdl/bin/script/build (modified) (4 diffs)

trunk/gsdl/bin/script/build

@@ -130 +130 @@
     
     foreach $download_dir (@download) {
+
+        # remove any leading or trailing whitespace from filenames (just in case)
+        $download_dir =~ s/^\s+//;
+        $download_dir =~ s/\s+$//;
         
         if ($download_dir =~ /^http:\/\//) {
@@ -141 +145 @@
         # is a file or directory on the local file system.
         $download_dir =~ s/^file:(\/\/)?//;
+        $download_dir =~ s/^\s+//; # may be whitespace between "file://" and the rest
         
         if (-e $download_dir) {
@@ -152 +157 @@
             &append_file ($out, "$outfile.download");
         } else {
-            print $out "WARNING: $download_dir does not exist\n";
+            print $out "WARNING: '$download_dir' does not exist\n";
         }
         }
@@ -184 +189 @@
     } else {
         # no import or archives
-        print $out "build: ERROR: The $collection collection has no import\n";
-        print $out "       or archives data. Try downloading an unbuilt version\n";
-        print $out "       of the collection from www.nzdl.org\n";
+        print $out "build: ERROR: The $collection collection has no import or archives data.\n";
         &final_out (1) if $use_out;
         die "\n";