From ade6989039e73115b1549a75d12bc92a4d0cd575 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Galv=C3=A3o?= <info@vitorgalvao.com>
Date: Mon, 17 Jun 2019 15:11:30 +0100
Subject: [PATCH] Make clyang-welly the main welly (#64943)

---
 Casks/clyang-welly.rb | 21 ---------------------
 Casks/welly.rb        | 23 ++++++++++++++---------
 2 files changed, 14 insertions(+), 30 deletions(-)
 delete mode 100644 Casks/clyang-welly.rb

diff --git a/Casks/clyang-welly.rb b/Casks/clyang-welly.rb
deleted file mode 100644
index d2da619ecea..00000000000
--- a/Casks/clyang-welly.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-cask 'clyang-welly' do
-  version '3.1.1.1'
-  sha256 'f17aa74d8668d02ff7c6eee81ae7e0c06d76a51d4aa50624ffe757c95f498ecf'
-
-  url "https://github.com/clyang/welly/releases/download/#{version}/Welly.v#{version}.zip"
-  appcast 'https://github.com/clyang/welly/releases.atom'
-  name 'Welly'
-  homepage 'https://github.com/clyang/welly'
-
-  auto_updates true
-
-  app 'Welly.app'
-
-  zap trash: [
-               '~/Library/Application Support/Welly',
-               '~/Library/Caches/Welly',
-               '~/Library/Caches/org.net9.Welly',
-               '~/Library/Cookies/org.net9.Welly.binarycookies',
-               '~/Library/Preferences/org.net9.Welly.plist',
-             ]
-end
diff --git a/Casks/welly.rb b/Casks/welly.rb
index 857ad93db90..3197234e447 100644
--- a/Casks/welly.rb
+++ b/Casks/welly.rb
@@ -1,16 +1,21 @@
 cask 'welly' do
-  version '2.7'
-  sha256 'cb24a26432d8927b1159a1865602c3f30b5190f628167c954e4d6cc723cfcb0f'
+  version '3.1.1.1'
+  sha256 'f17aa74d8668d02ff7c6eee81ae7e0c06d76a51d4aa50624ffe757c95f498ecf'
 
-  # storage.googleapis.com was verified as official when first introduced to the cask
-  url "https://storage.googleapis.com/google-code-archive-downloads/v#{version.major}/code.google.com/welly/Welly.v#{version}.fix.zip"
-  appcast 'https://csie.io/welly/update.xml'
+  url "https://github.com/clyang/welly/releases/download/#{version}/Welly.v#{version}.zip"
+  appcast 'https://github.com/clyang/welly/releases.atom'
   name 'Welly'
-  homepage 'https://code.google.com/archive/p/welly'
+  homepage 'https://github.com/clyang/welly'
+
+  auto_updates true
 
   app 'Welly.app'
 
-  caveats do
-    discontinued
-  end
+  zap trash: [
+               '~/Library/Application Support/Welly',
+               '~/Library/Caches/Welly',
+               '~/Library/Caches/org.net9.Welly',
+               '~/Library/Cookies/org.net9.Welly.binarycookies',
+               '~/Library/Preferences/org.net9.Welly.plist',
+             ]
 end