From 63e0d0b779094aa6f07ead0ca141da373e995e44 Mon Sep 17 00:00:00 2001
From: xarkes <xarkes@users.noreply.github.com>
Date: Wed, 26 Dec 2018 13:00:18 +0100
Subject: [PATCH] Cutter 1.7.3 release

---
 .appveyor.yml      |  2 +-
 .travis.yml        |  2 ++
 scripts/release.sh | 49 ----------------------------------------------
 src/Cutter.pro     |  2 +-
 4 files changed, 4 insertions(+), 51 deletions(-)
 delete mode 100755 scripts/release.sh

diff --git a/.appveyor.yml b/.appveyor.yml
index 9ecbd438..77e8be4a 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -37,7 +37,7 @@ install:
   - cmd: python -m pip install meson==0.48.2
   - cmd: powershell -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; wget %NINJA_URL% -OutFile ninja.zip; Expand-Archive .\ninja.zip -DestinationPath ."
   # Artifacts
-  - cmd: set "ARTIFACT_NAME=Cutter_win_%ARCH%"
+  - cmd: set "ARTIFACT_NAME=Cutter-v1.7.3-%ARCH%.Windows"
   - cmd: if not %APPVEYOR_REPO_TAG% equ true ( echo "This is not tagged as release, will deploy nightly..." )
   - cmd: if not %APPVEYOR_REPO_TAG% equ true ( set "ARTIFACT_NAME=%ARTIFACT_NAME%-nightly" && set "DEPLOY_RELEASE=nightly" ) else ( set "DEPLOY_RELEASE=%APPVEYOR_REPO_TAG_NAME%" )
   - cmd: if defined MESON ( set "ARTIFACT_PATH=dist_%ARCH%" ) else ( set "ARTIFACT_PATH=build_%ARCH%\cutter" )
diff --git a/.travis.yml b/.travis.yml
index 78b860aa..b52c103f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,7 +46,9 @@ install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then source scripts/prepare_python_linux.sh    ; fi
 
 before_script:
+  - echo "Using tag: '$TRAVIS_TAG'"
   - if [[ "$TRAVIS_TAG" == "" ]]; then export TAGNAME="nightly" && export NIGHTLY="-nightly" ; else export TAGNAME="$TRAVIS_TAG" && export NIGHTLY="" ; fi
+  - echo "TAGNAME: '$TAGNAME', NIGHTLY: '$NIGHTLY'"
   - git submodule init ; git submodule update
   - cd radare2
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
diff --git a/scripts/release.sh b/scripts/release.sh
deleted file mode 100755
index 05d9f2bf..00000000
--- a/scripts/release.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-# A small script to go faster when releasing
-
-FILES=".appveyor.yml README.md docs/_config.yml docs/index.md"
-
-# Quick check on arguments
-if [ ! "$#" -eq 1 ]; then
-    echo "Usage: $0 <release version>"
-    exit 1
-fi
-
-# Get old version in x.x.x format
-old_version=$(git tag | grep v | tail -n1 | cut -c2-)
-version="$1"
-
-# Do files modification
-git checkout -b "r${version}"
-echo "Releasing version '${version}'..."
-
-# Modify version in the global files
-for file in ${FILES}; do
-    sed -i "s,${old_version},${version},g" "${file}"
-done
-
-# Add a row in appdata.xml
-n=$(grep -ne 1.7.2 src/org.radare.Cutter.appdata.xml | cut -f1 -d:)
-today=$(date +%F)
-line="\ \ \ \ <release version=\"${version}\" date=\"${today}\" />"
-sed -i "${n}i${line}" ./src/org.radare.Cutter.appdata.xml
-
-# Show difference
-git diff
-
-# Commit and push
-git add ${FILES} src/org.radare.Cutter.appdata.xml
-git commit -m "Release ${version}"
-git push origin "r${version}"
-
-# Checkout to master and create tag
-# Meanwhile, the branch must be merged into master
-sleep 60
-git checkout master
-git pull
-git tag "v${version}"
-git push --tags
-
-# Now print changelog...
-git log "v${old_version}..HEAD"
-
diff --git a/src/Cutter.pro b/src/Cutter.pro
index 78937669..afd228a4 100644
--- a/src/Cutter.pro
+++ b/src/Cutter.pro
@@ -4,7 +4,7 @@ TARGET = Cutter
 
 CUTTER_VERSION_MAJOR = 1
 CUTTER_VERSION_MINOR = 7
-CUTTER_VERSION_PATCH = 2
+CUTTER_VERSION_PATCH = 3
 
 VERSION = $${CUTTER_VERSION_MAJOR}.$${CUTTER_VERSION_MINOR}.$${CUTTER_VERSION_PATCH}