rebuild 0.3.0.pre3 → 0.3.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57561e60786e642b55ea0dac2797b26928f43625
-  data.tar.gz: 1a221c7aedb3641e3fa608f9fc00fc5b3a2cb2fc
+  metadata.gz: f6deaa0fa07f8d9993e756558e87d62d6b93e5e7
+  data.tar.gz: 5e31f30511642946a1695fe045c10044e0365bd6
 SHA512:
-  metadata.gz: a979572424abc1a4697a212a04c8763bccbc7f8a8da84cee3d4192b30c41a2b488fd23b0bc9933bb5beaf810287320a9437ba2fd515def046584af9f8016952d
-  data.tar.gz: 7f5d2d6568af9e5e4731e7c0e7bd9e8bb6881a168061d7ac2458b77cfd1a4efd7f74cc592f408299e01444e7e121070afcbed9f8c14bd948539ffdd9b4270f69
+  metadata.gz: 5aa32c5b0338dd14bfff763b5ccff9bc3c875f98a2caf161238ebf7be08a98dae7838bff460fa2529257d2818a2efbaa11fb1008b199fca2a5af5a74f4ac75ac
+  data.tar.gz: 30a36a931f44ef6f65014f31d46de52b6b900f1af8c4c0acbcc9d4469b62e396215416a1f1f9c42b0e1f6110b6b79c862cf7e6366ebfd522b252401734090fb6

data/lib/rebuild/homebrew.rb

@@ -8,7 +8,7 @@ module Rebuild
       end
 
       def install
-        Script.execute_exp('homebrew')
+        Script.execute_sh('homebrew')
       end
     end
   end

data/lib/rebuild/script.rb

@@ -13,6 +13,11 @@ module Rebuild
         `#{'sudo' if sudo} expect -f #{script_path}`
       end
 
+      def execute_sh(name)
+        script_path = File.join(script_dir, "#{name}.sh")
+        system('sh', script_path)
+      end
+
       private
 
       def script_dir

data/lib/rebuild/version.rb

@@ -1,3 +1,3 @@
 module Rebuild
-  VERSION = '0.3.0.pre3'
+  VERSION = '0.3.0.pre4'
 end

data/script/homebrew.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+install_url=https://raw.githubusercontent.com/Homebrew/install/master/install
+temp_script=/tmp/brew_installer
+curl -fsSL $install_url > $temp_script
+
+expect -c '
+set timeout -1
+spawn ruby /tmp/brew_installer
+
+expect {
+  "Press RETURN to continue or any other key to abort"
+  {
+    send "\r"
+    exp_continue
+  }
+}
+'
+
+rm $temp_script

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rebuild
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre3
+  version: 0.3.0.pre4
 platform: ruby
 authors:
 - Takashi Kokubun
@@ -82,7 +82,7 @@ files:
 - rebuild.gemspec
 - script/agree_license.exp
 - script/click_done.scpt
-- script/homebrew.exp
+- script/homebrew.sh
 - script/start_install.scpt
 homepage: https://github.com/k0kubun/rebuild
 licenses:

data/script/homebrew.exp

@@ -1,12 +0,0 @@
-#!/usr/bin/env expect -f
-
-set timeout -1
-spawn ruby -e "\"\$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)\""
-
-expect {
-  "Press RETURN to continue or any other key to abort"
-  {
-    send "\r"
-    exp_continue
-  }
-}