From 9cedb348c45973a543f567003089bc9062587979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <florian.maerkl@seitwerk.de>
Date: Fri, 27 Sep 2019 13:09:18 +0200
Subject: [PATCH] Clean chiaki.rb Cask

---
 .travis.yml                  | 2 +-
 scripts/chiaki.rb.in         | 7 ++++---
 scripts/configure-cask.cmake | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 37dd391..004cd66 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -89,7 +89,7 @@ matrix:
         - /usr/local/opt/qt/bin/macdeployqt Chiaki.app -dmg
         - export DEPLOY_FILE="Chiaki-macOS-${CHIAKI_VERSION}-x86_64.dmg"
         - mv Chiaki.dmg "$DEPLOY_FILE"
-        - cmake -DCHIAKI_VERSION="${CHIAKI_VERSION}" -DCHIAKI_DMG="${DEPLOY_FILE}" -DCHIAKI_DMG_FILENAME="${DEPLOY_FILE}" -DCHIAKI_CASK_OUT=chiaki.rb -P scripts/configure-cask.cmake
+        - cmake -DCHIAKI_VERSION="${CHIAKI_VERSION}" -DCHIAKI_DMG="${DEPLOY_FILE}" -DCHIAKI_CASK_OUT=chiaki.rb -P scripts/configure-cask.cmake
         - echo "------------------- chiaki.rb cask -------------------"
         - cat chiaki.rb
         - echo "------------------------------------------------------"
diff --git a/scripts/chiaki.rb.in b/scripts/chiaki.rb.in
index 3aff874..c9fd136 100644
--- a/scripts/chiaki.rb.in
+++ b/scripts/chiaki.rb.in
@@ -2,14 +2,15 @@ cask 'chiaki' do
   version '@CHIAKI_VERSION@'
   sha256 '@CHIAKI_DMG_SHA256@'
 
-  url "https://github.com/thestr4ng3r/chiaki/releases/download/v@CHIAKI_VERSION@/@CHIAKI_DMG_FILENAME@"
+  url "https://github.com/thestr4ng3r/chiaki/releases/download/v#{version}/Chiaki-v#{version}-macOS-x86_64.dmg"
+  appcast 'https://github.com/thestr4ng3r/chiaki/releases.atom'
   name 'Chiaki'
   homepage 'https://github.com/thestr4ng3r/chiaki'
 
-  app "Chiaki.app"
+  app 'Chiaki.app'
 
   zap trash: [
                '~/Library/Application Support/Chiaki',
-               '~/Library/Preferences/com.chiaki.Chiaki.plist'
+               '~/Library/Preferences/com.chiaki.Chiaki.plist',
              ]
 end
diff --git a/scripts/configure-cask.cmake b/scripts/configure-cask.cmake
index 21e273d..62a7dae 100644
--- a/scripts/configure-cask.cmake
+++ b/scripts/configure-cask.cmake
@@ -1,6 +1,6 @@
 
-if(NOT CHIAKI_VERSION OR NOT CHIAKI_DMG OR NOT CHIAKI_DMG_FILENAME OR NOT CHIAKI_CASK_OUT)
-	message(FATAL_ERROR "CHIAKI_VERSION, CHIAKI_DMG, CHIAKI_DMG_FILENAME and CHIAKI_CASK_OUT must be set.")
+if(NOT CHIAKI_VERSION OR NOT CHIAKI_DMG OR NOT CHIAKI_CASK_OUT)
+	message(FATAL_ERROR "CHIAKI_VERSION, CHIAKI_DMG and CHIAKI_CASK_OUT must be set.")
 endif()
 
 if(CHIAKI_VERSION MATCHES "^v([0-9].*)$")