aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authorJack Nagel2014-04-04 22:02:48 -0500
committerJack Nagel2014-04-04 22:02:48 -0500
commit584884608accbf202906549b45d3f9d81abad34f (patch)
tree743ee179b8021f313e78622928f09e5fee033fc6 /Library/Formula
parent07d0b9931a62acbfe1342a1d0ae75157109cbf51 (diff)
downloadhomebrew-584884608accbf202906549b45d3f9d81abad34f.tar.bz2
Clean up some concatentation inside interpolation
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/drake.rb2
-rw-r--r--Library/Formula/fits.rb2
-rw-r--r--Library/Formula/fzf.rb2
-rw-r--r--Library/Formula/gvp.rb6
4 files changed, 6 insertions, 6 deletions
diff --git a/Library/Formula/drake.rb b/Library/Formula/drake.rb
index 8f5ee1419..4550d52c2 100644
--- a/Library/Formula/drake.rb
+++ b/Library/Formula/drake.rb
@@ -22,6 +22,6 @@ class Drake < Formula
EOS
# force run (no user prompt) the full workflow
- system bin/'drake', '--auto', "--workflow=#{testpath/'Drakefile'}", '+...'
+ system bin/"drake", "--auto", "--workflow=#{testpath}/Drakefile", "+..."
end
end
diff --git a/Library/Formula/fits.rb b/Library/Formula/fits.rb
index 84e44176d..5de1edf32 100644
--- a/Library/Formula/fits.rb
+++ b/Library/Formula/fits.rb
@@ -20,7 +20,7 @@ class Fits < Formula
libexec.install 'fits-env.sh'
%w[fits.sh fits-ngserver.sh].each do |file|
inreplace file, '"$(dirname $BASH_SOURCE)/fits-env.sh"',
- "'#{libexec/'fits-env.sh'}'"
+ "'#{libexec}/fits-env.sh'"
end
bin.install 'fits.sh' => 'fits'
diff --git a/Library/Formula/fzf.rb b/Library/Formula/fzf.rb
index 4018599de..2dc0a2809 100644
--- a/Library/Formula/fzf.rb
+++ b/Library/Formula/fzf.rb
@@ -22,6 +22,6 @@ class Fzf < Formula
test do
(testpath/"list").write %w[hello world].join($/)
- `cat #{testpath/"list"} | fzf -f wld`.chomp == "world"
+ `cat #{testpath}/list | fzf -f wld`.chomp == "world"
end
end
diff --git a/Library/Formula/gvp.rb b/Library/Formula/gvp.rb
index 4e46070f4..6c3f12616 100644
--- a/Library/Formula/gvp.rb
+++ b/Library/Formula/gvp.rb
@@ -20,8 +20,8 @@ class Gvp < Formula
test do
assert Kernel.system("gvp init"), "`gvp init` exited with a non-zero status"
assert File.directory?(".godeps"), "`gvp init` did not create the .godeps directory"
- assert_equal `gvp in 'echo $GOPATH' | grep -v '>> Local GOPATH set.'`.chomp, "#{testpath/".godeps"}:#{testpath}", "`gvp in` did not change the GOPATH"
- assert_equal `gvp in 'echo $GOBIN' | grep -v '>> Local GOPATH set.'`.chomp, "#{testpath/".godeps/bin"}:#{ENV["GOBIN"]}", "`gvp in` did not change the GOBIN"
- assert_equal `gvp in 'echo $PATH' | grep -v '>> Local GOPATH set.'`.chomp, "#{testpath/".godeps/bin"}:#{ENV["PATH"]}", "`gvp in` did not change the PATH"
+ assert_equal `gvp in 'echo $GOPATH' | grep -v '>> Local GOPATH set.'`.chomp, "#{testpath}/.godeps:#{testpath}", "`gvp in` did not change the GOPATH"
+ assert_equal `gvp in 'echo $GOBIN' | grep -v '>> Local GOPATH set.'`.chomp, "#{testpath}/.godeps/bin:#{ENV["GOBIN"]}", "`gvp in` did not change the GOBIN"
+ assert_equal `gvp in 'echo $PATH' | grep -v '>> Local GOPATH set.'`.chomp, "#{testpath}/.godeps/bin:#{ENV["PATH"]}", "`gvp in` did not change the PATH"
end
end