#388 Fix issue with copying platform specific files

cortoproject · Nov 1, 2015 · 6488bad · 6488bad
1 parent 92bf8b8
commit 6488bad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/build/artefact.rb b/build/artefact.rb
@@ -147,8 +147,8 @@ def corto_replace(str)
             if (not File.exists? lib) then
                 abort "\033[1;31m[ #{l} not found ]\033[0;49m"
             end
-            lib
         end
+        lib
     end
 
     OBJECTS.concat(LINKED)

diff --git a/build/library.rb b/build/library.rb
@@ -52,11 +52,11 @@
 		etc = "#{ENV['CORTO_TARGET']}/etc/corto/#{VERSION}/#{TARGETPATH}"
 		sh "mkdir -p #{etc}"
 		if File.exists? "etc/everywhere" then
-		    sh "cp -r etc/everywhere/ #{etc}/ 2> /dev/null"
+	        sh "cp -r etc/everywhere/* #{etc}/"
 		end
 		platformStr = "etc/" + `uname -s`[0...-1] + "-" + `uname -p`[0...-1]
 		if File.exists? platformStr then
-		    sh "cp -r " + platformStr + "/ #{etc}"
+		    sh "cp -r " + platformStr + "/* #{etc}"
 		end
 	end	
 	if ENV['CORTO_TARGET'] != "/usr/local" then
-Original file line number
+Diff line change
@@ Expand Up / @@ -147,8 +147,8 @@ def corto_replace(str) @@
                 if (not File.exists? lib) then
                     abort "\033[1;31m[ #{l} not found ]\033[0;49m"
                 end
-                lib
             end
+            lib
         end
         OBJECTS.concat(LINKED)
@@ Expand Down @@