Remove sipbmp3-itunes. See the mac branch of github.com/jhamrick/gutenbach

[Scripts/git/.git] / barnowl / zcrypt.pl

diff --git a/barnowl/zcrypt.pl b/barnowl/zcrypt.pl
index 75d73a7338a18abe02519fdf4b3ac5e481c76fd0..8ce18ff8ad118a308ad6b36e82a82a4ec4af733d 100644 (file)
--- a/barnowl/zcrypt.pl
+++ b/barnowl/zcrypt.pl
@@ -1,6 +1,6 @@
 # BarnOwls older than late September 2008 will segfault on short zcrypt messages.
 # Besides, the code is sketchy and doesn't belong in core. This perl module
-# will add :zcrypt and :decrypt commands that use outland's zcrypt binary via
+# will add :zcrypt and :decrypt commands that use barnowl's zcrypt binary via
 # Perl, so a bug in zcrypt can't possibly affect BarnOwl proper. The :zcrypt
 # command replaces the built-in one.
 #
@@ -23,9 +23,9 @@ BarnOwl::new_command(decrypt => sub {
        @args = ('-c', $msg->class, '-i', $msg->instance);
    }
    my ($zo, $zi);
-   my $pid = open2($zo, $zi, '/mit/outland/bin/zcrypt', '-D', @args) or die "Couldn't launch zcrypt\n";
+   my $pid = open2($zo, $zi, 'athrun', 'barnowl', 'zcrypt', '-D', @args) or die "Couldn't launch zcrypt\n";
    my $decrypted;
-   print $zi $msg->body . "\n";
+   print $zi @{$msg->fields}[1] . "\n";
    close $zi;
    while (<$zo>) {
       chomp;
@@ -37,7 +37,7 @@ BarnOwl::new_command(decrypt => sub {
    },
    {summary => "Decrypt a zcrypted message once",
     usage => "decrypt [args]",
-    description => "Invokes /mit/outland/bin/zcrypt on the current message,\n
+    description => "Invokes athrun barnowl zcrypt on the current message,\n
 using the class and instance to find the crypt key, and pops up the\n
 decrypted output. If args are specified, they are passed to zcrypt and the\n
 class and instance are ignored.\n\n
@@ -46,11 +46,12 @@ SEE ALSO: zcrypt(1)"});
 BarnOwl::new_command(zcrypt => sub {
    my $cmd = shift;
    my @args = @_;
-   my $argstring = join ' ', @args;
-   BarnOwl::start_edit_win("/mit/outland/bin/zcrypt $argstring", sub {
+   #my $argstring = BarnOwl::quote(@args);  # requires BarnOwl 1.4
+   my $argstring = join ' ', map { BarnOwl::quote($_) } @args;
+   BarnOwl::start_edit_win("athrun barnowl zcrypt $argstring", sub {
       my $msg = shift;
       my ($zo, $zi);
-      my $pid = open2($zo, $zi, '/mit/outland/bin/zcrypt', @args);
+      my $pid = open2($zo, $zi, 'athrun', 'barnowl', 'zcrypt', @args);
       print $zi "$msg\n";
       close $zi;
       local $/;
@@ -58,7 +59,7 @@ BarnOwl::new_command(zcrypt => sub {
       waitpid $pid, 0;
       });
    },
-   {summary => "Run /mit/outland/bin/zcrypt",
+   {summary => "Run athrun barnowl zcrypt",
     usage => "zcrypt -c [class] -i [instance]",
-    description => "Calls /mit/outland/bin/zcrypt on a message you type in.\n\n
+    description => "Calls athrun barnowl zcrypt on a message you type in.\n\n
 SEE ALSO: zcrypt(1)"});