Skip to content

Commit

Permalink
DiffMerge: Use pkg installer
Browse files Browse the repository at this point in the history 
Also add a file to the zap :delete stanza, and further DRY up the url
stanza.
  • Loading branch information
@jawshooah
jawshooah committed Oct 11, 2015
1 parent 4a4cd95 commit bc8b74b
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions Casks/diffmerge.rb
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
cask :v1 => 'diffmerge' do
version '4.2.0.697'
sha256 '2c6368653af2440bb4460aef9bb1b2b5d8b84b5a3f47994c4abafc4d7ddbff9e'
sha256 '681b43b6ba5750934143798ee6876cde1ffe63db0fd8eae692dd75a59ceb26cf'

url "http://download-us.sourcegear.com/DiffMerge/4.2.0/DiffMerge.#{version}.intel.stable.dmg"
url "http://download-us.sourcegear.com/DiffMerge/#{version.sub(/\.\d+$/, '')}/DiffMerge.#{version}.intel.stable.pkg"
name 'DiffMerge'
homepage 'https://www.sourcegear.com/diffmerge'
license :unknown # todo: change license and remove this comment; ':unknown' is a machine-generated placeholder

app 'DiffMerge.app'
binary 'DiffMerge.app/Contents/MacOS/DiffMerge', :target => 'diffmerge'
pkg "DiffMerge.#{version}.intel.stable.pkg"

zap :delete => [
'~/Library/Preferences/com.sourcegear.DiffMerge.plist',
'~/Library/Preferences/SourceGear DiffMerge Preferences'
]
uninstall :pkgutil => 'com.sourcegear.DiffMerge'

zap :delete => [
'~/Library/Preferences/com.sourcegear.DiffMerge.plist',
'~/Library/Preferences/SourceGear DiffMerge Preferences',
'~/Library/Saved Application State/com.sourcegear.DiffMerge.savedState'
]

caveats <<-EOS.undent
Use "diffmerge --nosplash" to hide the splash screen when using
Expand Down

3 comments on commit bc8b74b

@Mohitpandey
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jawshooah Quick question, why did we switch we package version from dmg? Now it asks for admin password.

@jawshooah
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Search the issues for diffmerge and you'll find your answer. I'm on mobile, otherwise I'd link you.

@Mohitpandey
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I think this is the one you are talking about: #13934

I guess i should reach out to the original author asking them to fix their script.

Please sign in to comment.