Changeset 29683 for main

Timestamp:

2015-01-09T15:53:33+13:00 (9 years ago)

Author:

Jeremy Symon

Message:

Added option to delete sites/interfaces

Location:

main/trunk/package-kits/scripts

Files:

• gs-mkinterface.pl (modified) (1 diff)
• gs-mksite.pl (modified) (1 diff)
• perllib/Greenstone/Directory.pm (modified) (2 diffs)

main/trunk/package-kits/scripts/gs-mkinterface.pl

@@ -8 +8 @@
 use Greenstone::Interface;
 
+my $delete = 0;
+
+for (@ARGV) {
+    if (/^-/) {
+        if (/^-delete$/) {
+            $delete = 1;
+        } else {
+            die "Unknown flag '$_'\n";
+        }
+    }
+}
+
 my $interface = Greenstone::Interface->new (shift);
-$interface->exists and die "Interface already exists\n";
-$interface->create and print "Interface created\n";
+if ($delete) {
+    $interface->delete and print "Interface deleted\n";
+} else {
+    $interface->create and print "Interface created\n";
+}

main/trunk/package-kits/scripts/gs-mksite.pl

@@ -8 +8 @@
 use Greenstone::Site;
 
+my $delete = 0;
+
+for (@ARGV) {
+    if (/^-/) {
+        if (/^-delete$/) {
+            $delete = 1;
+        } else {
+            die "Unknown flag '$_'\n";
+        }
+    }
+}
+
 my $site = Greenstone::Site->new (shift);
-$site->exists and die "Site already exists\n";
-$site->create and print "Site created\n";
+if ($delete) {
+    $site->delete and print "Site deleted\n";
+} else {
+    $site->create and print "Site created\n";
+}

main/trunk/package-kits/scripts/perllib/Greenstone/Directory.pm

@@ -6 +6 @@
 use base 'Exporter';
 
+use File::Path 'remove_tree';
 use Greenstone::Config;
 
@@ -61 +62 @@
 sub create {
     my $self = shift;
-    $self->exists and return 0;
+    if ($self->exists) {
+        print STDERR "Site already exists\n";
+        return 0;
+    }
     mkdir $self->dir or die "Failed to create directory: $!\n";
     return 1;
 }
 
+sub delete {
+    my $self = shift;
+    unless ($self->exists) {
+        print STDERR "Site doesn't exist\n";
+        return 0;
+    }
+    remove_tree $self->dir or die "Failed to remove directory: $!\n";
+    return 1;
+}
+
 1;