rbbt-util 5.26.20 → 5.26.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b92efe3e401eaeeec427031f665e88ece42c4a8a39cac35ff1c2ed5148f471fe
-  data.tar.gz: 77269b375e40fcce3b5ba4589c6422a6253a8a0cc136689c964d7323734e8755
+  metadata.gz: a0ffa5b32ce869fb1371baa14d9d66cd30d37f829b8bc3dd55807afeddf188ee
+  data.tar.gz: 95c3cd549d8719e6f3da4eb89d64fd9915666c84d76eebc123067f9272d4036b
 SHA512:
-  metadata.gz: fcd84776db4a825762d260cc34575d74f8943543c2d410fb38a488c67e9f92210d59ada1f1b1c5dc94f40ec1a7e41bc796d1634fa27108811e132586ba1173e9
-  data.tar.gz: 532000c51cae567f919da52d4daed6941264d09bf05040b0bce6f3a3a7e490deeacbdefa4e48172308781f7b2489595480c13e08a9ae3a45e2ce9e99ec0803cf
+  metadata.gz: db46d5759962c088304b67cdf3f7b76282caaa343e4b1a14a32bae6c0c51277f7fedc25713792a07e6898252a2f05f62baf3cd6b08092ab14a6453834ecf08b9
+  data.tar.gz: 21d0111d50df3e10d29f563ec657f22df9e0e9623cd00733f8f98749434f38b048ae65ca8f017db5eb770a44cb1c8a2d18ee624fd5cd3048b70a6baf2b4ec55b

data/lib/rbbt/resource.rb

@@ -205,7 +205,65 @@ INSTALL_HELPER_FILE="#{helper_file}"
 source "$INSTALL_HELPER_FILE"
               EOF
 
-              script = preamble + "\n" + Open.read(content)
+              content = content.call if Proc === content
+
+              content = if content =~ /git:|\.git$/
+                          {:git => content}
+                        else
+                          {:src => content}
+                        end if String === content and Open.remote?(content)
+
+              script_text = case content
+                            when nil
+                              raise "No way to install #{path}"
+                            when Path
+                              Open.read(content) 
+                            when String
+                              if Misc.is_filename?(content) and Open.exists?(content)
+                                Open.read(content) 
+                              else
+                                content
+                              end
+                            when Hash
+                              name = content[:name] || File.basename(path)
+                              git = content[:git]
+                              src = content[:src]
+                              url = content[:url]
+                              extra = content[:extra]
+                              commands = content[:commands]
+                              if git
+                                <<-EOF
+
+name='#{name}'
+url='#{git}'
+
+install_git "$name" "$url" #{extra}
+
+#{commands}
+                                EOF
+                              elsif src
+                                <<-EOF
+
+name='#{name}'
+url='#{src}'
+
+install_src "$name" "$url" #{extra}
+
+#{commands}
+                                EOF
+                              else
+                                <<-EOF
+
+name='#{name}'
+url='#{url}'
+
+#{commands}
+                                EOF
+                              end
+                            end
+
+              script = preamble + "\n" + script_text
+              Log.debug "Installing software with script:\n" << script
               CMD.cmd_log('bash', :in => script)
 
               set_software_env(software_dir) unless $set_software_env

data/lib/rbbt/util/misc/system.rb

@@ -99,14 +99,14 @@ end
     res
   end
 
-  def self.filename?(string)
-    String === string and string.length > 0 and string.length < 250 and File.exist?(string)
-  end
-
   def self.is_filename?(string)
     return true if defined? PATH and Path === string
     return true if string.respond_to? :exists
-    return true if String === string and string.length < 265 and File.exist? string
+    return true if String === string and string.length < 265 and File.exist?(string)
     return false
   end
+
+  class << self
+    alias filename? is_filename?
+  end
 end

data/share/install/software/lib/install_helpers

@@ -273,8 +273,6 @@ build_make(){
         setup "$name"
         clean_build
     fi
-
-    cd "$old_pwd"
 }
 
 buid_cmake(){
@@ -388,7 +386,7 @@ setup(){
         pkg_dir="$(dirname $pkg_dir)/current"
     fi
 
-    if [ -d "$pkg_dir/bin/" ]; then
+    if [ -d "$pkg_dir/bin/" -o -d "$pkg_dir/usr/local/bin/" ]; then
 
         for exe in ` find "$pkg_dir/bin/" -maxdepth 1 -type f -executable`; do
             exe=$(basename $exe)
@@ -396,10 +394,17 @@ setup(){
             link "$pkg_dir/bin/$exe" "$OPT_DIR/bin/$exe" 2>/dev/null
         done
 
+        for exe in ` find "$pkg_dir/usr/local/bin/" -maxdepth 1 -type f -executable`; do
+            exe=$(basename $exe)
+            rm -f "$OPT_DIR/usr/local/bin/$exe"
+            link "$pkg_dir/usr/local/bin/$exe" "$OPT_DIR/bin/$exe" 2>/dev/null
+        done
+
+
     else
         local old_pwd="`expand_path $(pwd)`"
 
-        for exe in ` find "$pkg_dir/" "$pkg_dir/src/" -maxdepth 1 -type f -executable`; do
+        for exe in ` find "$pkg_dir/" "$pkg_dir/source/" "$pkg_dir/src/" -maxdepth 1 -type f -executable`; do
             orig=$exe
             exe=$(basename $exe)
             echo "EXE $exe"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.26.20
+  version: 5.26.21
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-19 00:00:00.000000000 Z
+date: 2019-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake