improve picoline and nmcli

Author: hasumikin

mrbgems/picoruby-editor/mrblib/editor.rb

@@ -223,7 +223,8 @@ def start
             history_head
           when 4 # Ctrl-D logout
             puts
-            return
+            puts "^D\e[0J"
+            raise "Abort"
           when 5 # Ctrl-E
             @buffer.tail
           when 9

mrbgems/picoruby-picoline/mrblib/picoline.rb

@@ -57,8 +57,8 @@ def ask(prompt, allow_empty: false)
           break buffer.lines[0].chomp
         end
       end
-      answer = q.default.to_s if answer.empty?
-      break if !answer.empty? || allow_empty
+      answer = q.default.to_s if answer.to_s.empty?
+      break if !answer.to_s.empty? || allow_empty
     end
     return(@answer = answer)
   end

mrbgems/picoruby-shell/shell_executables/nmcli.rb

@@ -20,6 +20,7 @@
   tag + ciphertext
 end
 
+puts "Ctrd-D to exit"
 cli = PicoLine.new
 answers = {"wifi" => {}}
 
@@ -28,10 +29,10 @@
 end
 answers["wifi"]["ssid"] = cli.ask("WiFi SSID?")
 password = cli.ask("WiFi Password? (leave blank if no password required)", allow_empty: true)
-answers["wifi"]["encoded_password"] = if !password.empty?
-  Base64.encode64(encrypt_proc.call(password))
-else
+answers["wifi"]["encoded_password"] = if password.nil? || password.empty?
   nil
+else
+  Base64.encode64(encrypt_proc.call(password))
 end
 answers["wifi"]["auto_connect"] = cli.ask("Auto Connect? (y/n)") do |q|
   q.default = "y"