提交: 7ae3cf11fb60653f4d3b35cc621de7760e0be251 - osdn-cli (git)

Commit MetaInfo

• 修訂: 7ae3cf11fb60653f4d3b35cc621de7760e0be251 (tree)
• 時間: 2016-03-15 20:49:35
• 作者: Tatsuki Sugiura <sugi@nemu...>
• Commiter: Tatsuki Sugiura

Log Message

Stop to launch web brwoser on non-x11 env.

Change Summary

• modified: ChangeLog
• modified: lib/osdn/cli/command/login.rb
• modified: lib/osdn/cli/version.rb

差異

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2016-03-15  Tatsuki Sugiura  <[e-mail]>
 
+	* Version 0.0.4
+	* login: stop to launch web browser on non-X11 environment.
+
[phone]  Tatsuki Sugiura  <[e-mail]>
+
+	* Version 0.0.3
 	* frs_upload: show upload progres in verbose mode.
 	* frs_upload: validates file digest after upload.
 

--- a/lib/osdn/cli/command/login.rb
+++ b/lib/osdn/cli/command/login.rb
@@ -31,12 +31,14 @@ module OSDN; module CLI; module Command
 
     def launch_brwoser(url)
       puts "Access follwoing URL to get auth code;\n#{url}"
-      %w(/usr/bin/xdg-open /usr/bin/X11/xdg-open /usr/local/bin/xdg-open
-             /usr/bin/x-www-browser /usr/bin/firefox /usr/local/bin/firefox
-            ).each do |bin|
-        File.executable?(bin) or next
-        exec(bin, url) if fork.nil?
-        return
+      if ENV['DISPLAY']
+        %w(/usr/bin/xdg-open /usr/bin/X11/xdg-open /usr/local/bin/xdg-open
+               /usr/bin/x-www-browser /usr/bin/firefox /usr/local/bin/firefox
+              ).each do |bin|
+          File.executable?(bin) or next
+          exec(bin, url) if fork.nil?
+          return
+        end
       end
       case RUBY_PLATFORM
       when /mswin|msys|mingw|cygwin|bccwin|wince|emc/

--- a/lib/osdn/cli/version.rb
+++ b/lib/osdn/cli/version.rb
@@ -1,5 +1,5 @@
 module OSDN
   module CLI
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end