From 24913549efe5a02d1ad68829b965ba0bca7a6b97 Mon Sep 17 00:00:00 2001
From: Le Tan <tamlokveer@gmail.com>
Date: Thu, 23 Mar 2017 21:14:44 +0800
Subject: [PATCH] Override files in BinTray

---
 .linux_bintray.json | 5 +++--
 .macos_bintray.json | 5 +++--
 .travis_linux.sh    | 3 +--
 .travis_macos.sh    | 3 +--
 appveyor.yml        | 7 ++++---
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.linux_bintray.json b/.linux_bintray.json
index 1a9947f6..52989564 100644
--- a/.linux_bintray.json
+++ b/.linux_bintray.json
@@ -17,14 +17,15 @@
 
     "version": {
         "name": "1.1",
-        "desc": "VNote v1.1",
+        "desc": "VNote Releases",
         "released": "2017-03-22",
         "vcs_tag": "1.1",
         "gpgSign": false
     },
 
     "files":
-        [{"includePattern": "build/distrib/(VNote_.*_linux_x86_64_portable.tar.gz)", "uploadPattern": "$1"}],
+        [{"includePattern": "build/distrib/(VNote_linux_.*\\.tar\\.gz)", "uploadPattern": "$1",
+          "matrixParams": {"override": 1 }}],
 
     "publish": true
 }
diff --git a/.macos_bintray.json b/.macos_bintray.json
index 2cca9ade..d16ce735 100644
--- a/.macos_bintray.json
+++ b/.macos_bintray.json
@@ -17,14 +17,15 @@
 
     "version": {
         "name": "1.1",
-        "desc": "VNote v1.1",
+        "desc": "VNote Releases",
         "released": "2017-03-22",
         "vcs_tag": "1.1",
         "gpgSign": false
     },
 
     "files":
-        [{"includePattern": "build/distrib/(VNote_.*\\.dmg)", "uploadPattern": "$1"}],
+        [{"includePattern": "build/distrib/(VNote_.*\\.dmg)", "uploadPattern": "$1",
+          "matrixParams": {"override": 1 }}],
 
     "publish": true
 }
diff --git a/.travis_linux.sh b/.travis_linux.sh
index 6e563c3b..0ce43fe7 100644
--- a/.travis_linux.sh
+++ b/.travis_linux.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 project_dir=$(pwd)
 qt_install_dir=/opt
-version="${version}.${TRAVIS_BUILD_NUMBER}"
 
 cd ${qt_install_dir}
 sudo wget https://github.com/adolby/qt-more-builds/releases/download/5.7/qt-opensource-5.7.0-linux-x86_64.7z
@@ -54,6 +53,6 @@ echo "${TRAVIS_COMMIT}" >> version
 
 # Package portable executable
 cd ..
-tar -czvf VNote_${version}_linux_x86_64_portable.tar.gz VNote
+tar -czvf VNote_linux_x86_64_portable_${version}.tar.gz VNote
 
 exit 0
diff --git a/.travis_macos.sh b/.travis_macos.sh
index 917a5cf4..f3d04bfb 100644
--- a/.travis_macos.sh
+++ b/.travis_macos.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 project_dir=$(pwd)
-version="${version}.${TRAVIS_BUILD_NUMBER}"
 
 brew update > /dev/null
 brew install qt@5.7
@@ -44,7 +43,7 @@ ln -s /Applications ./Applications
 
 cd ..
 hdiutil create -srcfolder ./VNote -format UDBZ ./VNote.dmg
-mv VNote.dmg VNote_${version}_mac_X64.dmg
+mv VNote.dmg VNote_mac_X64_${version}.dmg
 cd ..
 
 exit 0
diff --git a/appveyor.yml b/appveyor.yml
index b2a90b7a..a8c94e45 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -38,18 +38,19 @@ build_script:
 
 # scripts that run after build
 after_build:
+    - set vnote_version=1.1
     - mkdir distrib\VNote
     - windeployqt.exe --dir .\distrib\VNote %APPVEYOR_BUILD_FOLDER%\build\src\release\VNote.exe
     - copy "%APPVEYOR_BUILD_FOLDER%\build\src\release\VNote.exe" "distrib\VNote\VNote.exe"
     - copy "%APPVEYOR_BUILD_FOLDER%\README.md" "distrib\VNote\README.md"
     - copy "%APPVEYOR_BUILD_FOLDER%\LICENSE" "distrib\VNote\LICENSE.txt"
-    - echo %APPVEYOR_BUILD_VERSION% > "distrib\VNote\version.txt"
+    - echo %vnote_version% > "distrib\VNote\version.txt"
     - echo %APPVEYOR_REPO_COMMIT% >> "distrib\VNote\version.txt"
     - cd distrib
-    - 7z a VNote_%APPVEYOR_BUILD_VERSION%_win_%PLATFORM%_portable.zip VNote
+    - 7z a VNote_win_%PLATFORM%_portable_%vnote_version%.zip VNote
 
 artifacts:
-    - path: build\distrib\VNote_%APPVEYOR_BUILD_VERSION%_win_%PLATFORM%_portable.zip
+    - path: build\distrib\VNote_win_%PLATFORM%_portable_%vnote_version%.zip
       name: portable
 
 deploy: