micro_install 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 699159d6205ef44705c6fb74a9df412fbf9c6f753213acf12945c767a7b7ff79
-  data.tar.gz: ab616b77824fd1a26570c8f22123f1c68e07e0204ecb42f3ae3dfee5193c4e3e
+  metadata.gz: a560d92ac077fb3e1b2551980a72107d0f296fdb1d2553063f5619292dec8bce
+  data.tar.gz: d23b62d8d855377e61bc4a18281abc0323cde65de30409e89edf04f3751b251d
 SHA512:
-  metadata.gz: 20c49a2d2b17c294087e60400e714ceb6473b05890b7dc491df17107fc6803519609b8ee9db854ff4a8d8f4ae8339e292a8b6b5bf9222f2686e6bc5c5185a8d9
-  data.tar.gz: 332f45f938a84d0d3c836f363cedb7d66400ad82388715f8eb191d97aa4ee3016ded6a41e4d31b160074b0c62048504f7aa0f14337f997ce290a71aa8c2bf694
+  metadata.gz: e453d25de1f0649b1a512c09d96b389a6cf7c8eaedb093e62adf6b91f59d5395b829709e3185f7b6271c02d721742a49dcbea10ba044749f1877516d7763002f
+  data.tar.gz: 443edf25d3ba57dd297a348c9c59d83d48ed7786c1c5bf16568d1b42a0a8b57b6708518582abdd9acb70f35ac7937398e65dc91f10ff51f777d5ef1678d4a9aa

data/bin/micro-install

@@ -38,5 +38,23 @@ else
   hl.say "#{Paint['Warning', 'orange']}: #{Dir.home}/.local/bin is not in $PATH,"
   installer.is_installed_but_no_bin
 end
+if @arch == 'arm-linux'
+  note = <<~NOTE
+  #{Paint['NOTE','orange']}: Termux, while being the only linux subsystem
+  for android that micro_install supports, is a bit wonky when it
+  comes to shebangs and Bash startup.
+    
+  1. If you haven't already, create a '.bashrc' in '~'
+  2. Add the next line into your bashrc after everything else
+     having to do with paths.
 
+     export PATH="#{Dir.home}/.local/bin:$PATH"
 
+  3. Restart your bash session, or re-source your .bashrc
+  
+      'source ~/.bashrc'
+
+
+  NOTE
+  hl.say note
+end

data/lib/micro_install.rb

@@ -7,13 +7,13 @@ require 'paint'
 module MicroInstall
   class LookupError < Exception
   end
-  
+
   class Installer
-    
+    attr :arch
     def initialize(hl = HighLine.new($stdin, $stdout))
       @hl = hl
     end
-    
+
     def latesttag(hl = @hl)
       begin
         hl.say "#{Paint["Getting Latest Tag", 'green']}"
@@ -23,57 +23,60 @@ module MicroInstall
         }
         hl.say "#{Paint['Latest Tag', 'green']}: #{Paint[@tag, 'yellow']}"
       rescue
-       hl.say "#{Paint['Error', 'red']}: Unable to retrieve latest release."
+        hl.say "#{Paint['Error', 'red']}: Unable to retrieve latest release."
       end
     end
-    
+
     def get_arch(hl = @hl)
       begin
         host_os = OS.config['host_os']
         bits    = OS.bits.to_s
         case host_os
-          when "linux-gnu"
-            if bits == "64"
-              @arch = 'linux64'
-            elsif bits == "32"
-              @arch = 'linux32'
-            end
-          when "darwin"
-            @arch = 'osx'
-          when "freebsd"
-            if bits == "64"
-              @arch = 'freebsd64'
-            elsif bits == "32"
-              @arch = 'freebsd32'
-            end
-          when "openbsd"
-            if bits == "64"
-              @arch = 'openbsd64'
-            elsif bits == "32"
-              @arch = 'openbsd32'
-            end
-          when "netbsd"
-            if bits == "64"
-              @arch = 'netbsd64'
-            elsif bits == "32"
-              @arch = 'netbsd32'
-            end
+        when "linux-gnu"
+          if bits == "64"
+            @arch = 'linux64'
+          elsif bits == "32"
+            @arch = 'linux32'
+          end
+        when "darwin"
+          @arch = 'osx'
+        when "freebsd"
+          if bits == "64"
+            @arch = 'freebsd64'
+          elsif bits == "32"
+            @arch = 'freebsd32'
+          end
+        when "openbsd"
+          if bits == "64"
+            @arch = 'openbsd64'
+          elsif bits == "32"
+            @arch = 'openbsd32'
+          end
+        when "netbsd"
+          if bits == "64"
+            @arch = 'netbsd64'
+          elsif bits == "32"
+            @arch = 'netbsd32'
+          end
 
         end
         if OS.config['host_cpu'] == 'arm' or OS.config['host_os'] =~ /linux-arm/ or OS.config['host_os'] =~ /arm-linux/
           @arch = 'linux-arm'
         end
+        if @arch.nil?
+          raise MicroInstall::LookupError.new 'Unable to determine your system'
+        end
       rescue MicroInstall::LookupError => e
         hl.say "#{Paint['Error', 'red']}: #{e}"
       end
-    
+
     end
-    
+
     def download_url(hl = @hl)
       @download_url = "https://github.com/zyedidia/micro/releases/download/v#{@tag}/micro-#{@tag}-#{@arch}.tar.gz"
       hl.say("#{Paint['URL', 'yellow']}: #{@download_url}")
     end
-    
+
     def download_micro_tar(hl = @hl)
       hl.say "Downloading... "
       MicroInstall.show_wait_spinner {
@@ -86,7 +89,7 @@ module MicroInstall
       }
       print "\n"
     end
-    
+
     def extract_micro(hl = @hl)
       begin
         hl.say Paint["Extracting micro-#{@tag}-#{@arch}.tar.gz", 'yellow']
@@ -111,11 +114,11 @@ module MicroInstall
         end
       rescue
         hl.say "#{Paint['Error']}: Could not extract micro due to an error."
-      
+
       end
-    
+
     end
-    
+
     def install_micro(hl = @hl)
       hl.say "#{Paint['Checking if ~/.local/bin exists.', 'yellow']}"
       if Dir.exist? Pathname(Dir.home).join('.local/bin')
@@ -146,17 +149,19 @@ module MicroInstall
         hl.say "#{Paint['Error', 'red']}: #{e}"
       end
     end
+
     def is_installed(hl = @hl)
       hl.say [
                  "Micro has been installed to your ~/.local/bin/ directory. You can run it with:",
                  "'micro'"
              ].join
     end
+
     def is_installed_but_no_bin(hl = @hl)
       hl.say [
-          "Micro is installed to ~/.local/bin/, but can't run,",
-          "Please check your ~/.bashrc and/or ~/.profile and see",
-          "if '~/.local/bin/' is being added to the PATH variable"
+                 "Micro is installed to ~/.local/bin/, but can't run,",
+                 "Please check your ~/.bashrc and/or ~/.profile and see",
+                 "if '~/.local/bin/' is being added to the PATH variable"
              ]
     end
   end

data/lib/micro_install/version.rb

@@ -1,3 +1,3 @@
 module MicroInstall
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: micro_install
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Ken Spencer