From e621c15a99773de8547c162da2f52924672d0800 Mon Sep 17 00:00:00 2001 From: Jocker Date: Sat, 16 Sep 2023 22:02:57 +0800 Subject: [PATCH 1/4] add cloudnet 1.36.2 --- Casks/c/cloudnet.rb | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 Casks/c/cloudnet.rb diff --git a/Casks/c/cloudnet.rb b/Casks/c/cloudnet.rb new file mode 100644 index 0000000000..95e53423f0 --- /dev/null +++ b/Casks/c/cloudnet.rb @@ -0,0 +1,45 @@ +cask "cloudnet" do + version "1.36.2.0" + sha256 :no_check + + url "https://pkgs.cloudnet.world/stable/macos/CloudNet.dmg", + verified: "pkgs.cloudnet.world/stable/macos/" + name "CloudNet for Mac client" + desc "Professional and easy-to-use enterprise-level meshVPN product" + homepage "https://cloudnet.world/" + + # This appcast is slower to update than the submissions we get. See: + # https://github.com/Homebrew/homebrew-cask/pull/90907#issuecomment-710107547 + livecheck do + url "https://pkgs.cloudnet.world/stable/appcast.xml" + strategy :sparkle, &:version + end + + auto_updates true + depends_on macos: ">= :catalina" + + app "CloudNet.app" + + installer script: { + executable: "/Applications/CloudNet.app/Contents/Resources/cloudnetd.sh", + args: ["install"], + sudo: true, + } + + # osascript -e 'id of app "CloudNet"' + uninstall quit: "world.cloudnet.client", + launchctl: "world.cloudnet.client.cloudnetd", + script: { + executable: "/Applications/CloudNet.app/Contents/Resources/cloudnetd.sh", + args: ["remove"], + input: ["Y\n"], + sudo: true, + } + + zap trash: [ + "/Library/LaunchDaemons/world.cloudnet.client.cloudnetd.plist", + "~/Library/Preferences/world.cloudnet.client.cloudnetd.plist", + "~/Library/Containers/world.cloudnet.client", + "~/Library/Group Containers/$(TeamIdentifierPrefix)world.cloudnet.client", + ] +end From 2ed9c63ec06a5c8c6bd7405c74a410eb8bb11697 Mon Sep 17 00:00:00 2001 From: Jocker Date: Sun, 17 Sep 2023 22:19:19 +0800 Subject: [PATCH 2/4] update: CloudNet 1.36.2.1 --- Casks/c/cloudnet.rb | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/Casks/c/cloudnet.rb b/Casks/c/cloudnet.rb index 95e53423f0..75a9234058 100644 --- a/Casks/c/cloudnet.rb +++ b/Casks/c/cloudnet.rb @@ -1,9 +1,8 @@ cask "cloudnet" do - version "1.36.2.0" - sha256 :no_check + version "1.36.2.1" + sha256 "53489f77226b4fa55fcefeed68dfeb66e289e3307cfaaa298a4895488dfac6ac" - url "https://pkgs.cloudnet.world/stable/macos/CloudNet.dmg", - verified: "pkgs.cloudnet.world/stable/macos/" + url "https://pkgs.cloudnet.world/stable/macos/CloudNet_v#{version}.dmg" name "CloudNet for Mac client" desc "Professional and easy-to-use enterprise-level meshVPN product" homepage "https://cloudnet.world/" @@ -16,25 +15,24 @@ cask "cloudnet" do end auto_updates true + conflicts_with formula: "dayunet2009/tap/cloudnet" depends_on macos: ">= :catalina" app "CloudNet.app" - installer script: { - executable: "/Applications/CloudNet.app/Contents/Resources/cloudnetd.sh", + executable: "CloudNet.app/Contents/Resources/cnet", args: ["install"], sudo: true, } - # osascript -e 'id of app "CloudNet"' - uninstall quit: "world.cloudnet.client", + uninstall quit: "world.cloudnet.client", launchctl: "world.cloudnet.client.cloudnetd", script: { - executable: "/Applications/CloudNet.app/Contents/Resources/cloudnetd.sh", - args: ["remove"], - input: ["Y\n"], + executable: "CloudNet.app/Contents/Resources/cnet", + args: ["uninstall"], sudo: true, - } + }, + delete: "/Applications/CloudNet.app" zap trash: [ "/Library/LaunchDaemons/world.cloudnet.client.cloudnetd.plist", From 2f30efccef3907ae89bcdbc0d6798d5dacb09c74 Mon Sep 17 00:00:00 2001 From: Jocker Date: Mon, 18 Sep 2023 08:37:21 +0800 Subject: [PATCH 3/4] update: CloudNet 1.36.2.1 --- Casks/c/cloudnet.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/Casks/c/cloudnet.rb b/Casks/c/cloudnet.rb index 75a9234058..30ff6fa6f4 100644 --- a/Casks/c/cloudnet.rb +++ b/Casks/c/cloudnet.rb @@ -15,7 +15,6 @@ cask "cloudnet" do end auto_updates true - conflicts_with formula: "dayunet2009/tap/cloudnet" depends_on macos: ">= :catalina" app "CloudNet.app" From 6e01e0af8bef1c7de8447d92bc0f0674b8e9f80c Mon Sep 17 00:00:00 2001 From: Miccal Matthews Date: Mon, 18 Sep 2023 16:59:49 +0800 Subject: [PATCH 4/4] Update cloudnet.rb --- Casks/c/cloudnet.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Casks/c/cloudnet.rb b/Casks/c/cloudnet.rb index 30ff6fa6f4..c55d46fec6 100644 --- a/Casks/c/cloudnet.rb +++ b/Casks/c/cloudnet.rb @@ -4,14 +4,12 @@ cask "cloudnet" do url "https://pkgs.cloudnet.world/stable/macos/CloudNet_v#{version}.dmg" name "CloudNet for Mac client" - desc "Professional and easy-to-use enterprise-level meshVPN product" + desc "Enterprise-level meshVPN cloud service" homepage "https://cloudnet.world/" - # This appcast is slower to update than the submissions we get. See: - # https://github.com/Homebrew/homebrew-cask/pull/90907#issuecomment-710107547 livecheck do url "https://pkgs.cloudnet.world/stable/appcast.xml" - strategy :sparkle, &:version + strategy :sparkle end auto_updates true @@ -31,12 +29,14 @@ cask "cloudnet" do args: ["uninstall"], sudo: true, }, - delete: "/Applications/CloudNet.app" + delete: [ + "/Applications/CloudNet.app", + "/Library/LaunchDaemons/world.cloudnet.client.cloudnetd.plist", + ] zap trash: [ - "/Library/LaunchDaemons/world.cloudnet.client.cloudnetd.plist", - "~/Library/Preferences/world.cloudnet.client.cloudnetd.plist", "~/Library/Containers/world.cloudnet.client", "~/Library/Group Containers/$(TeamIdentifierPrefix)world.cloudnet.client", + "~/Library/Preferences/world.cloudnet.client.cloudnetd.plist", ] end