rbbt-util 5.17.65 → 5.17.66

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/rbbt/resource.rb +9 -2
  3. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a491cb85ffe8880ce8d17b7fe84905e8100e8190
4
- data.tar.gz: 78966fc2770ca77c7a77e8e85ac90337aa9a9996
3
+ metadata.gz: 0ef711b3e60776fe76714a2e0d71b86a36fe6287
4
+ data.tar.gz: b46b1eda7bb4fedb500f423bc096c820d0cc9f68
5
5
  SHA512:
6
- metadata.gz: 493e53ffa157eb5afc5b84c12e586fc1f821f3e261b6c92c765ba20ccf35988f2be1605cdb564aebe607f3c2c2162823567a94f5dcb0ccb2e036ea881b7db030
7
- data.tar.gz: 83dd903ba1e8cd0c3088cef60f1490746317d0f803080565d4adfb4b9e256b9c45f59472638171b7166ac0085cdb75908f9bf9ae72adddb044578cda2dba7ef8
6
+ metadata.gz: 7d10d1091b0fb9a7c309071e2489532ecc19752417a98fdb104cc7f816a17508edcfc707824592fa9872c69438007b6938a5e77d6adfb8c1ff7315a4f80971e0
7
+ data.tar.gz: 652e85cd3c4347ee50c69d899167e6f5beaf3c4320b8c9d6c8e0e68a9476ea07c12e4befdb7c2b1e0a93eb0506ed7cb901a603291d49488daa4854c8b3d13524
data/lib/rbbt/resource.rb CHANGED
@@ -169,16 +169,23 @@ module Resource
169
169
  when :install
170
170
  Log.debug "Installing software: #{path}"
171
171
  software_dir = path.resource.root.software.find :user
172
+ helper_file = File.expand_path(Rbbt.share.install.software.lib.install_helpers.find(:lib, caller_lib_dir(__FILE__)))
173
+ #helper_file = File.expand_path(Rbbt.share.install.software.lib.install_helpers.find)
174
+
172
175
  preamble = <<-EOF
173
176
  #!/bin/bash
174
177
 
175
178
  RBBT_SOFTWARE_DIR="#{software_dir}"
176
179
 
177
- INSTALL_HELPER_FILE="#{Rbbt.share.install.software.lib.install_helpers.find :lib, caller_lib_dir(__FILE__)}"
180
+ INSTALL_HELPER_FILE="#{helper_file}"
178
181
  source "$INSTALL_HELPER_FILE"
179
182
  EOF
180
183
 
181
- CMD.cmd('bash', :in => preamble + "\n" + Open.read(content))
184
+ script = preamble + "\n" + Open.read(content)
185
+ install_io = CMD.cmd('bash', :in => script, :log => true, :pipe => true)
186
+ while line = install_io.gets
187
+ Log.debug line
188
+ end
182
189
 
183
190
  set_software_env(software_dir)
184
191
  else
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rbbt-util
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.17.65
4
+ version: 5.17.66
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-08-05 00:00:00.000000000 Z
11
+ date: 2015-08-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake