From 04fca669174f6606677c911b02717f71393b6d20 Mon Sep 17 00:00:00 2001 From: Bevan Kay Date: Mon, 18 Dec 2023 14:17:13 +1100 Subject: [PATCH 1/4] powerpanel 2.5.1 --- Casks/p/powerpanel.rb | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/Casks/p/powerpanel.rb b/Casks/p/powerpanel.rb index 77d6142889..b65d561b10 100644 --- a/Casks/p/powerpanel.rb +++ b/Casks/p/powerpanel.rb @@ -1,8 +1,8 @@ cask "powerpanel" do - version "2.4.8" - sha256 "b3517556c2fb9b6dfc0b912ec60b10f12ce54d7075f43d2d727a48d3e264f1b0" + version "2.5.1" + sha256 "947d222bcf866b7b218673c7624331370d7392e4f5e7f46dbdb31c59868d307e" - url "https://dl4jz3rbrsfum.cloudfront.net/software/ppp_macos_#{version.dots_to_underscores}.dmg", + url "https://dl4jz3rbrsfum.cloudfront.net/software/PPP_Mac_v#{version}.pkg", verified: "dl4jz3rbrsfum.cloudfront.net/" name "CyberPower PowerPanel Personal" desc "Manage and control UPS systems" @@ -10,19 +10,15 @@ cask "powerpanel" do livecheck do url "https://www.cyberpowersystems.com/product/software/power-panel-personal/powerpanel-personal-mac/" - regex(%r{href=.*?/ppp_macos[._-]v?(\d+(?:_\d+)*)\.dmg}i) - strategy :page_match do |page, regex| - page.scan(regex).map { |match| match[0].tr("_", ".").to_s } - end + regex(/href=.*?PPP[._-]Mac[._-]v?(\d+(?:\.\d+)+)\.pkg/i) end depends_on macos: ">= :mojave" - installer manual: "CyberPower PowerPanel Personal Installer.app" + pkg "PPP_Mac_v#{version}.pkg" uninstall pkgutil: "com.cpsww.ppupsd", - launchctl: "com.cpsww.ppupsd", - delete: "/Applications/CyberPower PowerPanel Personal" + launchctl: "com.cpsww.ppupsd" zap trash: [ "~/Library/Preferences/PowerPanel Personal.plist", From 29eb65ea0abbdfc553acae6969fc627c895bef2a Mon Sep 17 00:00:00 2001 From: Justin Krehel <39449589+krehel@users.noreply.github.com> Date: Sun, 17 Dec 2023 23:10:14 -0500 Subject: [PATCH 2/4] powerpanel: update `uninstall` --- Casks/p/powerpanel.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Casks/p/powerpanel.rb b/Casks/p/powerpanel.rb index b65d561b10..454b6d864e 100644 --- a/Casks/p/powerpanel.rb +++ b/Casks/p/powerpanel.rb @@ -17,8 +17,11 @@ cask "powerpanel" do pkg "PPP_Mac_v#{version}.pkg" - uninstall pkgutil: "com.cpsww.ppupsd", - launchctl: "com.cpsww.ppupsd" + uninstall pkgutil: ["com.cpsww.ppupsd", + "com.cyberpower.powerpanelpersonal.ppp"], + launchctl: ["com.cpsww.ppupsd", + "com.cyberpower.powerpanel-personal.client", + "com.cyberpower.powerpanel-personal.daemon"] zap trash: [ "~/Library/Preferences/PowerPanel Personal.plist", From 54b7c99474ea16f163e30f198e808d33182cf732 Mon Sep 17 00:00:00 2001 From: Bevan Kay Date: Mon, 18 Dec 2023 15:14:14 +1100 Subject: [PATCH 3/4] powerpanel: fix/update style --- Casks/p/powerpanel.rb | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Casks/p/powerpanel.rb b/Casks/p/powerpanel.rb index 454b6d864e..f8e8bfe5f8 100644 --- a/Casks/p/powerpanel.rb +++ b/Casks/p/powerpanel.rb @@ -17,11 +17,15 @@ cask "powerpanel" do pkg "PPP_Mac_v#{version}.pkg" - uninstall pkgutil: ["com.cpsww.ppupsd", - "com.cyberpower.powerpanelpersonal.ppp"], - launchctl: ["com.cpsww.ppupsd", - "com.cyberpower.powerpanel-personal.client", - "com.cyberpower.powerpanel-personal.daemon"] + uninstall pkgutil: [ + "com.cpsww.ppupsd", + "com.cyberpower.powerpanelpersonal.ppp", + ], + launchctl: [ + "com.cpsww.ppupsd", + "com.cyberpower.powerpanel-personal.client", + "com.cyberpower.powerpanel-personal.daemon", + ] zap trash: [ "~/Library/Preferences/PowerPanel Personal.plist", From 852529847d9ce2b81869847507dcd9baf2592d9f Mon Sep 17 00:00:00 2001 From: Bevan Kay Date: Mon, 18 Dec 2023 15:25:17 +1100 Subject: [PATCH 4/4] powerpanel: update uninstall --- Casks/p/powerpanel.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Casks/p/powerpanel.rb b/Casks/p/powerpanel.rb index f8e8bfe5f8..d418a0db37 100644 --- a/Casks/p/powerpanel.rb +++ b/Casks/p/powerpanel.rb @@ -25,7 +25,8 @@ cask "powerpanel" do "com.cpsww.ppupsd", "com.cyberpower.powerpanel-personal.client", "com.cyberpower.powerpanel-personal.daemon", - ] + ], + delete: "/Applications/PowerPanel Personal.app" zap trash: [ "~/Library/Preferences/PowerPanel Personal.plist",