Merge pull request #15458 from reitermarkus/cask-renames-token

Fix wrong token in `Cask::Migrator`.
This commit is contained in:
Markus Reiter 2023-05-19 14:53:07 +02:00 committed by GitHub
commit f984495db0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -25,10 +25,9 @@ module Cask
return unless (installed_caskfile = new_cask.installed_caskfile) return unless (installed_caskfile = new_cask.installed_caskfile)
installed_token = installed_caskfile.relative_path_from(Caskroom.path).basename.to_s
return if new_cask.token == installed_token
old_cask = CaskLoader.load(installed_caskfile) old_cask = CaskLoader.load(installed_caskfile)
return if new_cask.token == old_cask.token
migrator = new(old_cask, new_cask) migrator = new(old_cask, new_cask)
migrator.migrate(dry_run: dry_run) migrator.migrate(dry_run: dry_run)
end end