From 2a8850649bc3b567a5b3e8c77dafb3ba4290d8b9 Mon Sep 17 00:00:00 2001 From: Bevan Kay Date: Mon, 18 Dec 2023 13:03:05 +1100 Subject: [PATCH 1/2] flykey: rename cask, rebuild --- Casks/f/fly-key.rb | 19 ------------------- Casks/f/flykey.rb | 22 ++++++++++++++++++++++ cask_renames.json | 1 + 3 files changed, 23 insertions(+), 19 deletions(-) delete mode 100644 Casks/f/fly-key.rb create mode 100644 Casks/f/flykey.rb diff --git a/Casks/f/fly-key.rb b/Casks/f/fly-key.rb deleted file mode 100644 index b6a45741c0..0000000000 --- a/Casks/f/fly-key.rb +++ /dev/null @@ -1,19 +0,0 @@ -cask "fly-key" do - version "1.5" - sha256 "2b89a5994d40e618e9f792097286122f35f137199c495474fa3ac949a23d8366" - - url "https://cdn.better365.cn/FlyKey/FlyKey#{version}.dmg" - name "FlyKey" - desc "One-click display of shortcuts" - homepage "https://www.better365.cn/FlyKey.html" - - livecheck do - url "https://www.better365.cn/FlyKey.xml" - strategy :sparkle, &:short_version - end - - pkg "FlyKey#{version}.pkg" - - uninstall pkgutil: "cn.better365.FlyKey", - quit: "cn.better365.FlyKey" -end diff --git a/Casks/f/flykey.rb b/Casks/f/flykey.rb new file mode 100644 index 0000000000..37bceb339e --- /dev/null +++ b/Casks/f/flykey.rb @@ -0,0 +1,22 @@ +cask "flykey" do + version "1.6.3,2023121601" + sha256 "806cc526c293ed42124a4b13d8dd06f2c06137a2e933507ecd9b9ba157c605cf" + + url "https://cdn.better365.cn/FlyKey/FlyKey#{version.csv.second}.zip" + name "FlyKey" + desc "One-click display of shortcuts" + homepage "https://www.better365.cn/FlyKey.html" + + livecheck do + url "https://www.better365.cn/FlyKey.xml" + strategy :sparkle + end + + app "FlyKey.app" + + zap trash: [ + "~/Library/HTTPStorages/cn.better365.FlyKey", + "~/Library/HTTPStorages/cn.better365.FlyKey.binarycookies", + "~/Library/Preferences/cn.better365.FlyKey.plist", +] +end diff --git a/cask_renames.json b/cask_renames.json index 3a462ab056..e7bca40958 100644 --- a/cask_renames.json +++ b/cask_renames.json @@ -4,6 +4,7 @@ "cloudapp": "zight", "epilogue-operator": "epilogue-playback", "figmadaemon": "figma-agent", + "fly-key": "flykey", "hepta": "heptabase", "mat": "memoryanalyzer", "mouse-fix": "mac-mouse-fix", From 6a1a2b39ef181cadea8224b46750751057223f18 Mon Sep 17 00:00:00 2001 From: Bevan Kay Date: Mon, 18 Dec 2023 13:10:58 +1100 Subject: [PATCH 2/2] flykey: fix style, add depends_on --- Casks/f/flykey.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Casks/f/flykey.rb b/Casks/f/flykey.rb index 37bceb339e..090075ff98 100644 --- a/Casks/f/flykey.rb +++ b/Casks/f/flykey.rb @@ -12,11 +12,13 @@ cask "flykey" do strategy :sparkle end + depends_on macos: ">= :catalina" + app "FlyKey.app" zap trash: [ - "~/Library/HTTPStorages/cn.better365.FlyKey", - "~/Library/HTTPStorages/cn.better365.FlyKey.binarycookies", - "~/Library/Preferences/cn.better365.FlyKey.plist", -] + "~/Library/HTTPStorages/cn.better365.FlyKey", + "~/Library/HTTPStorages/cn.better365.FlyKey.binarycookies", + "~/Library/Preferences/cn.better365.FlyKey.plist", + ] end