rbatch 2.1.3 → 2.1.4
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/rbatch/variables.rb +4 -2
- data/lib/rbatch/version.rb +1 -1
- metadata +1 -1
data/lib/rbatch/variables.rb
CHANGED
@@ -1,3 +1,4 @@
|
|
1
|
+
require 'pathname'
|
1
2
|
require 'rbatch/run_conf'
|
2
3
|
|
3
4
|
module RBatch
|
@@ -12,6 +13,7 @@ module RBatch
|
|
12
13
|
:date => Time.now.strftime("%Y%m%d"),
|
13
14
|
:time => Time.now.strftime("%H%M%S"),
|
14
15
|
}
|
16
|
+
@vars[:program_noext] = Pathname(@vars[:program_base]).sub_ext("").to_s
|
15
17
|
|
16
18
|
if ENV["RB_VERBOSE"]
|
17
19
|
@vars[:journal_verbose] = ENV["RB_VERBOSE"].to_i
|
@@ -37,7 +39,7 @@ module RBatch
|
|
37
39
|
@run_conf = RunConf.new(@vars[:run_conf_path]) # load run_conf
|
38
40
|
@vars.merge!(@run_conf.opt)
|
39
41
|
@vars[:common_config_path] = File.join(@vars[:conf_dir],@vars[:common_conf_name])
|
40
|
-
@vars[:config_path] = File.join(@vars[:conf_dir]
|
42
|
+
@vars[:config_path] = File.join(@vars[:conf_dir],@vars[:program_noext] + ".yaml")
|
41
43
|
end #end def
|
42
44
|
|
43
45
|
def[](key)
|
@@ -47,7 +49,7 @@ module RBatch
|
|
47
49
|
.gsub("<home>", @vars[:home_dir])
|
48
50
|
.gsub("<date>", @vars[:date])
|
49
51
|
.gsub("<time>", @vars[:time])
|
50
|
-
.gsub("<prog>", @vars[:
|
52
|
+
.gsub("<prog>", @vars[:program_noext])
|
51
53
|
.gsub("<host>", @vars[:host_name])
|
52
54
|
else
|
53
55
|
@vars[key]
|
data/lib/rbatch/version.rb
CHANGED