X-Git-Url: https://git.donarmstrong.com/?p=bin.git;a=blobdiff_plain;f=deletemailbox;h=9491d4811249bee8c95e732e62b2643441911ca0;hp=d21a8f41a5412457b8eef869cc0b26701e403f7a;hb=4621d23526ccf936d1ad076ece0bc663510dfc52;hpb=79e6b6c498e1ba7db910532408da490099dffdae

diff --git a/deletemailbox b/deletemailbox
index d21a8f4..9491d48 100755
--- a/deletemailbox
+++ b/deletemailbox
@@ -82,25 +82,25 @@ $DEBUG = $options{debug};
 for my $mbox (@ARGV) {
      # Delete ~/.offlineimap/Repository-{Local,Remote}Lists/FolderValidity/mbox
      # initialcaps account needed for the account name
-     my $cmd = qq(rm -f $options{offlineimap}/Repository-Local).
+     my @cmd = ('rm','-f',qq($options{offlineimap}/Repository-Local).
 	  ucfirst($options{account}).
-	       qq(/FolderValidity/$mbox;\n);
-     print $cmd;
-     qx($cmd);
-     $cmd = qq(rm $options{offlineimap}/Repository-Remote).
+	       qq(/FolderValidity/$mbox));
+     print join(' ',@cmd);
+     system @cmd;
+     @cmd = ('rm','-f',qq($options{offlineimap}/Repository-Remote).
 	  ucfirst($options{account}).
-	       qq(/FolderValidity/$options{account}.$mbox;\n);
-     print $cmd;
-     qx($cmd);
+	       qq(/FolderValidity/$options{account}.$mbox));
+     print join(' ',@cmd);
+     system @cmd;
      # Delete ~/.offlineimap/Account-Lists/mbox
-     $cmd =  qq(rm -f $options{offlineimap}/Account-).ucfirst($options{account}).
-	  qq(/LocalStatus/$mbox;\n);
-     print $cmd;
-     qx($cmd);
+     @cmd = ('rm','-fr',qq($options{offlineimap}/Account-).ucfirst($options{account}).
+	     qq(/LocalStatus/$mbox));
+     print join(' ',@cmd);
+     system @cmd;
      # Delete ~/Mail/mbox
-     $cmd = qq(rm -rf $options{maildir}/$options{account}/$mbox;\n);
-     print $cmd;
-     qx($cmd);
+     @cmd = ('rm','-fr',qq($options{maildir}/$options{account}/$mbox));
+     print join(' ',@cmd);
+     system @cmd;
 }