Skip to content

Commit

Permalink
Merge pull request #7505 from rolandwalker/remove_more_destination_path
Browse files Browse the repository at this point in the history
Remove remaining uses of `destination_path`
  • Loading branch information
ndr committed Nov 21, 2014
2 parents e3ff377 + 0b9f3cf commit 9999ac2
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Casks/bankid.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

container :type => :naked
preflight do
system '/bin/mv', '--', staged_path.join('FileDownloader'), destination_path.join('bankid-latest.pkg')
system '/bin/mv', '--', staged_path.join('FileDownloader'), staged_path.join('bankid-latest.pkg')
end

pkg 'bankid-latest.pkg'
Expand Down
2 changes: 1 addition & 1 deletion Casks/git-annex.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# This is a horrible hack to force the file extension. The
# backend code should be fixed so that this is not needed.
preflight do
system '/bin/mv', '--', staged_path.join('git-annex-latest'), destination_path.join('git-annex-latest.dmg')
system '/bin/mv', '--', staged_path.join('git-annex-latest'), staged_path.join('git-annex-latest.dmg')
end
container :nested => 'git-annex-latest.dmg'
else
Expand Down
2 changes: 1 addition & 1 deletion Casks/nodeclipse.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
license :oss

preflight do
system '/bin/mv', '--', staged_path.join('eclipse/Eclipse.app'), destination_path.join('eclipse/Nodeclipse.app')
system '/bin/mv', '--', staged_path.join('eclipse/Eclipse.app'), staged_path.join('eclipse/Nodeclipse.app')
end
app 'eclipse/Nodeclipse.app'
end
2 changes: 1 addition & 1 deletion Casks/qlmarkdown.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# DSL to identify such containers and generate a target directory.
container :type => :naked
preflight do
system '/usr/bin/ditto', '-xk', '--', "#{staged_path}/QLMarkdown.qlgenerator.zip", "#{destination_path}/QLMarkdown.qlgenerator"
system '/usr/bin/ditto', '-xk', '--', "#{staged_path}/QLMarkdown.qlgenerator.zip", "#{staged_path}/QLMarkdown.qlgenerator"
end

qlplugin 'QLMarkdown.qlgenerator'
Expand Down
2 changes: 1 addition & 1 deletion Casks/ridibooks.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

container :type => :naked
preflight do
system '/bin/mv', '--', staged_path.join('getapp'), destination_path.join('ridibooks.pkg')
system '/bin/mv', '--', staged_path.join('getapp'), staged_path.join('ridibooks.pkg')
end
pkg 'ridibooks.pkg'
uninstall :pkgutil => 'com.ridibooks.Ridibooks'
Expand Down
2 changes: 1 addition & 1 deletion Casks/td-toolbelt.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

container :type => :naked
preflight do
system '/bin/mv', '--', "#{staged_path}/mac", "#{destination_path}/td-toolbelt.pkg"
system '/bin/mv', '--', "#{staged_path}/mac", "#{staged_path}/td-toolbelt.pkg"
end

pkg 'td-toolbelt.pkg'
Expand Down

0 comments on commit 9999ac2

Please sign in to comment.