Changeset 77c87b2 for perl/lib

Timestamp:

Oct 7, 2009, 5:05:57 PM (15 years ago)

Author:

Karl Ramm <kcr@1ts.org>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

1703f72

Parents:

dca3b27

git-author:

Karl Ramm <kcr@1ts.org> (10/07/09 17:00:01)

git-committer:

Karl Ramm <kcr@1ts.org> (10/07/09 17:05:57)

Message:

Strip trailing newlines from zsigs.

de3f6412cb0dc1b4e1044541558395c4c1fd807c caused a regression by not
dropping the trailing newline from the output of zsigproc.  Stripping
trailing newlines is generally a good thing, so let's do more of it.

File:

• perl/lib/BarnOwl.pm (modified) (1 diff)

perl/lib/BarnOwl.pm

@@ -435 +435 @@
 sub default_zephyr_signature
 {
-  if (my $zsig = getvar('zsig')) {
-    return $zsig;
+  my $zsig = getvar('zsig');
+  if (!$zsig && (my $zsigproc = getvar('zsigproc'))) {
+    $zsig = `$zsigproc`;
+  } elsif (!defined($zsig = get_zephyr_variable('zwrite-signature'))) {
+    $zsig = ((getpwuid($<))[6]);
+    $zsig =~ s/,.*//;
   }
-  if (my $zsigproc = getvar('zsigproc')) {
-    return `$zsigproc`;
-  }
-  my $zwrite_signature = get_zephyr_variable('zwrite-signature');
-  if (defined($zwrite_signature)) {
-    return $zwrite_signature;
-  }
-  my $name = ((getpwuid($<))[6]);
-  $name =~ s/,.*//;
-  return $name;
+  chomp($zsig);
+  return $zsig;
 }