Changeset 2566

Timestamp:

2001-06-19T13:01:40+12:00 (23 years ago)

Author:

sjboddie

Message:

Added a -make_writable option to build script so the collector can tell it
to make new collections globally writable (allowing them to be removed
from the command line on Unix installations)

Location:

trunk/gsdl

Files:

• bin/script/build (modified) (3 diffs)
• src/recpt/collectoraction.cpp (modified) (1 diff)

trunk/gsdl/bin/script/build

@@ -168 +168 @@
     print STDOUT "   -out                    Filename or handle to print output status to.\n";
     print STDOUT "                           The default is STDERR\n";
+    print STDOUT "   -make_writable          If set build will make the collection and any\n";
+    print STDOUT "                           temporary files it created globally writable after\n";
+    print STDOUT "                           it finishes\n";
     print STDOUT "   -log_events             Log important events (collection built successfully\n";
     print STDOUT "                           etc.) to event_log_file\n";
@@ -548 +551 @@
              'save_archives', \$save_archives,
              'out/.*/STDERR', \$out,
+             'make_writable', \$make_writable,
              'log_events', \$log_events,
              'event_log_file/.*/', \$event_log_file,
@@ -558 +562 @@
     }
 }
+
+
+END {
+
+    if ($make_writable) {
+    # chmod a+rw new collection
+    my $installed_collection = &util::filename_cat($ENV{'GSDLHOME'}, "collect", $collection);
+    &recursive_chmod($installed_collection);
+
+    # chmod a+rw anything we've left laying about in the tmp directory
+    if (($collectdir ne "") &&  
+        (!&util::filenames_equal ($collectdir, &util::filename_cat($ENV{'GSDLHOME'}, "collect")))) {
+        &recursive_chmod($collectdir);
+    }
+    }
+
+    sub recursive_chmod {
+    my ($dir) = @_;
+    return unless -d $dir;
+
+    chmod (0777, $dir);
+
+    opendir (DIR, $dir) || die;
+    my @files = readdir DIR;
+    closedir DIR;
+    
+    foreach my $file (@files) {
+        next if $file =~ /^\.\.?$/;
+        $file = &util::filename_cat($dir, $file);
+        if (-d $file) {
+        &recursive_chmod ($file);
+        } else {
+        chmod (0777, $file);
+        }
+    }
+    }
+}

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -1650 +1650 @@
     
   // set up build options
-  text_t options = "-remove_import -out \"";
+  text_t options = "-make_writable -remove_import -out \"";
   options += filename_cat (tmpdir, collection + ".bld");
   options += "\" -collectdir \"" + get_collectdir (args) + "\"";