Ensure correct encoding of default user name when no config is present

commit f4f3ec7de9795b2b4311dcbda016f2b2968c5631
parent 0185bed16bc252c450b548eecf0aeb30f5ff5524
Author: Gaute Hope <eg@gaute.vetsj.com>
Date:   Wed, 14 Aug 2013 19:59:54 +0200

Ensure correct encoding of default user name when no config is present

Diffstat:

lib/sup.rb

+++---

1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/sup.rb b/lib/sup.rb
@@ -271,7 +271,7 @@ EOM
     else
       require 'etc'
       require 'socket'
-      name = Etc.getpwnam(ENV["USER"]).gecos.split(/,/).first rescue nil
+      name = Etc.getpwnam(ENV["USER"]).gecos.split(/,/).first.force_encoding($encoding).fix_encoding rescue nil
       name ||= ENV["USER"]
       email = ENV["USER"] + "@" +
         begin
@@ -283,8 +283,8 @@ EOM
       config = {
         :accounts => {
           :default => {
-            :name => name,
-            :email => email,
+            :name => name.fix_encoding,
+            :email => email.fix_encoding,
             :alternates => [],
             :sendmail => "/usr/sbin/sendmail -oem -ti",
             :signature => File.join(ENV["HOME"], ".signature"),

sup.git