diff options
author | Eric Wong <e@80x24.org> | 2015-04-13 00:55:14 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2015-04-13 00:56:18 +0000 |
commit | c4ffed8a441fb0f16f0d206218b3580ae4460797 (patch) | |
tree | da80bed3b899db4633a3f1e91d5b7c1cf5b82ab2 /lib/dtas | |
parent | b1b8e7f08342c8864501338b92cc6d1dce9173b2 (diff) | |
download | dtas-c4ffed8a441fb0f16f0d206218b3580ae4460797.tar.gz |
We may expand them, so ensure they're properly escaped, first for use in shell snippets.
Diffstat (limited to 'lib/dtas')
-rw-r--r-- | lib/dtas/partstats.rb | 2 | ||||
-rw-r--r-- | lib/dtas/source/av_ff_common.rb | 2 | ||||
-rw-r--r-- | lib/dtas/source/sox.rb | 2 | ||||
-rw-r--r-- | lib/dtas/splitfx.rb | 6 |
4 files changed, 7 insertions, 5 deletions
diff --git a/lib/dtas/partstats.rb b/lib/dtas/partstats.rb index 9d3312b..bc13480 100644 --- a/lib/dtas/partstats.rb +++ b/lib/dtas/partstats.rb @@ -55,7 +55,7 @@ class DTAS::PartStats rd, wr = IO.pipe env = opts[:env] env = env ? env.dup : {} - env["INFILE"] = @infile + env["INFILE"] = xs(@infile) env["TRIMFX"] = "trim #{trim_part.tbeg}s #{trim_part.tlen}s" opts = { pgroup: true, close_others: true, err: wr } pid = spawn(env, CMD, opts) diff --git a/lib/dtas/source/av_ff_common.rb b/lib/dtas/source/av_ff_common.rb index 189e135..9f29b02 100644 --- a/lib/dtas/source/av_ff_common.rb +++ b/lib/dtas/source/av_ff_common.rb @@ -158,7 +158,7 @@ module DTAS::Source::AvFfCommon # :nodoc: e["PROBE"] = @probe_harder ? @probe_harder.join(' ') : nil # make sure these are visible to the source command... - e["INFILE"] = @infile + e["INFILE"] = xs(@infile) e["AMAP"] = amap e["SSPOS"] = sspos e["RGFX"] = rg_state.effect(self) || nil diff --git a/lib/dtas/source/sox.rb b/lib/dtas/source/sox.rb index 91a3c40..6f02f99 100644 --- a/lib/dtas/source/sox.rb +++ b/lib/dtas/source/sox.rb @@ -78,7 +78,7 @@ class DTAS::Source::Sox # :nodoc: def src_spawn(player_format, rg_state, opts) raise "BUG: #{self.inspect}#src_spawn called twice" if @to_io e = @env.merge!(player_format.to_env) - e["INFILE"] = @infile + e["INFILE"] = xs(@infile) # make sure these are visible to the "current" command... e["TRIMFX"] = trimfx diff --git a/lib/dtas/splitfx.rb b/lib/dtas/splitfx.rb index 022fbfe..fcd0028 100644 --- a/lib/dtas/splitfx.rb +++ b/lib/dtas/splitfx.rb @@ -362,8 +362,10 @@ class DTAS::SplitFX # :nodoc: end def infile_env(env, infile) - env["INFILE"] = infile - env["INDIR"], env["INBASE"] = File.split(File.expand_path(infile)) + env["INFILE"] = xs(infile) + dir, base = File.split(File.expand_path(infile)) + env["INDIR"] = xs(dir) + env["INBASE"] = xs(base) end def _expand_cmd(env, command) |