sigh, handle newlines properly

2 files changed, 3 insertions, 3 deletions

diff --git a/bin/pass b/bin/pass
index 76bc890..fcefcbb 100755
--- a/bin/pass
+++ b/bin/pass
@@ -55,8 +55,7 @@ if ($cmd && $cmd eq 'search') {
             }
         }
 
-        my $pass = `$PASS show $found[0]`;
-        $pass =~ s/\s+$//;
+        chomp(my $pass = `$PASS show $found[0]`);
         if ($clipboard) {
             clip($pass);
         }
diff --git a/bin/pwsafe2pass b/bin/pwsafe2pass
index 62796e9..fa7b634 100755
--- a/bin/pwsafe2pass
+++ b/bin/pwsafe2pass
@@ -10,6 +10,7 @@ readline;
 readline;
 
 while (my $line = <>) {
+    chomp $line;
     my ($uuid, $group, $name, $login, $passwd, $notes) = map {
         s/^"(.*)"$/$1/;
 
@@ -28,7 +29,7 @@ while (my $line = <>) {
 
     my $entry = join '/', $group, $name, length($login) ? ($login) : ();
 
-    open my $fh, '|-', 'pass', 'insert', ($notes ? ('-m') : ()), $entry
+    open my $fh, '|-', 'pass', 'insert', ($notes ? ('-m') : ('-e')), $entry
         or die "Couldn't insert!";
     $fh->print("$passwd\n");
     $fh->print("$notes\n") if $notes;