Changeset 1446

Timestamp:

04/04/12 17:14:48 (14 months ago)

Author:

ebaudrez

Message:

`verbose' mode is really debug mode

Remove the command-line flag `-v' (sorry). Instead, provide a
command-line flag `-d', which prints out useful information for
debugging. Rename the `inbox' only when not debugging.

File:

• projects/md2mb/devel/md2mb/bin/md2mb.pl (modified) (4 diffs)

projects/md2mb/devel/md2mb/bin/md2mb.pl

@@ -23 +23 @@
 # Is the newroot a file (1) or a dir (0)
 my $nrisfile = 0;
+# END CHANGE
 my $debug = 0;
-# END CHANGE
 my $help = 0;
 my $man = 0;
@@ -30 +30 @@
 # parse command-line options
 GetOptions(
+    'debug|d'   => \$debug,
     'help|h'    => \$help,
     'man|m'     => \$man,
-    'verbose|v' => sub { $debug++ },
 ) or pod2usage(2);
 pod2usage(1) if ($help);
 pod2usage(-exitstatus => 0, -verbose => 2) if ($man);
 
-print "DEBUG MODE, not doing anything, just printing\n" if ($debug);
+# debug mode overview
+if ($debug) {
+    print <<EOF;
+DEBUG MODE, not doing anything, just printing
+--- current state ---
+cmd     = $cmd
+oldroot = $oldroot
+newroot = $newroot
+--- end ---
+EOF
+}
+
+# create destination path
 if ($debug) { 
     print "TARGET DIR: mkdir -p $newroot\n" if ((not -d "$newroot") && (not $nrisfile));
@@ -46 +58 @@
 system("$cmd </dev/null >/dev/null 2>/dev/null") == 0 or die "cannot find formail on your \$PATH!\nTry installing procmail\nAborting";
 
+# the main work is done here
+if ($debug) {
+    print "DESCENDING INTO oldroot($oldroot)\n";
+}
 find(\&md2mb,($oldroot));
 
+# rename `inbox' to `Inbox'
 if ((-z "$newroot/Inbox") || (! -e "$newroot/Inbox")) {
-    print "Renaming inbox into Inbox\n";
-    move("$newroot/inbox","$newroot/Inbox") if (-e "$newroot/inbox");
+    if ($debug) {
+        print "RENAMING inbox($newroot/inbox) INTO Inbox($newroot/Inbox)\n" if (-e "$newroot/inbox");
+    } else {
+        print "Renaming inbox into Inbox\n";
+        move("$newroot/inbox","$newroot/Inbox") if (-e "$newroot/inbox");
+    }
 }
 
@@ -134 +155 @@
 
  Options:
-   -help        brief help message
-   -man         full documentation
+   -debug | -d      debug mode
+   -help | -h       brief help message
+   -man | -m        full documentation
 
 =head1 OPTIONS
 
 =over 4
+
+=item B<-debug>
+
+Enter debug mode. This will print what would be done. No commands are executed,
+so this is safe to use when testing.
 
 =item B<-help>