lib/blocks/block.rb in bake-toolkit-2.30.0 vs lib/blocks/block.rb in bake-toolkit-2.31.0
- old
+ new
@@ -102,10 +102,12 @@
end
end
res = []
+ return d if (inc[0] == "." || inc[0] == "..") # prio 0: force local
+
if (inc[0] == @projectName) # prio 1: the real path magic
resPathMagic = inc[1..-1].join("/") # within self
resPathMagic = "." if resPathMagic == ""
res << resPathMagic
elsif @referencedConfigs.include?(inc[0])
@@ -278,10 +280,12 @@
if Bake.options.clobber
Dir.chdir(@projectDir) do
if File.exist?".bake"
puts "Deleting folder .bake" if Bake.options.verbose >= 2
- FileUtils.rm_rf(".bake")
+ if !Bake.options.dry
+ FileUtils.rm_rf(".bake")
+ end
end
end
end
cleanSteps.each do |step|
\ No newline at end of file