diff --git a/windows/qtox-nsi-version.sh b/windows/qtox-nsi-version.sh new file mode 100755 index 000000000..2a68dbd2e --- /dev/null +++ b/windows/qtox-nsi-version.sh @@ -0,0 +1,53 @@ +#!/bin/bash +# +# Copyright © 2016 Zetok Zalbavar +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# script to append correct qTox version to `.nsi` files from +# `git describe` +# +# requires: +# * files `qtox.nsi` and `qtox64.nsi` in working dir +# * git – tags in format `v0.0.0` +# * GNU sed + +# usage: +# +# ./$script + +set -eu -o pipefail + + +# from e.g. `v123.456.789-321-asdf` get `123.456.789` part +get_version() { + git describe --tags \ + | sed -r \ + -e 's/^v//' \ + -e 's/^(([[:digit:]]+\.){2}[[:digit:]]+)-.*/\1/' +} + + +# append version to .nsi files after a certain line +append_version() { + local after_line=' ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayName" "qTox"' + local append=' ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion"' + + for nsi in *.nsi + do + sed -i "/$after_line/a\\$append \"$(get_version)\"" "$nsi" + done +} + +append_version diff --git a/windows/qtox.nsi b/windows/qtox.nsi index 1ef8a3f08..473d85ed4 100644 --- a/windows/qtox.nsi +++ b/windows/qtox.nsi @@ -281,7 +281,6 @@ Section "Install" ${WriteRegStr} "${REG_ROOT}" "${REG_APP_PATH}" "" "$INSTDIR\${MAIN_APP_EXE}" ${WriteRegStr} "${REG_ROOT}" "${REG_APP_PATH}" "Path" "$INSTDIR\bin\" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayName" "qTox" - ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion" "1.0" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "Publisher" "The qTox Project" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "UninstallString" "$INSTDIR\uninstall.exe" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "URLInfoAbout" "https://qtox.github.io" diff --git a/windows/qtox64.nsi b/windows/qtox64.nsi index fc2205f46..4ef47e277 100644 --- a/windows/qtox64.nsi +++ b/windows/qtox64.nsi @@ -281,7 +281,6 @@ Section "Install" ${WriteRegStr} "${REG_ROOT}" "${REG_APP_PATH}" "" "$INSTDIR\${MAIN_APP_EXE}" ${WriteRegStr} "${REG_ROOT}" "${REG_APP_PATH}" "Path" "$INSTDIR\bin\" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayName" "qTox" - ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion" "1.0" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "Publisher" "The qTox Project" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "UninstallString" "$INSTDIR\uninstall.exe" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "URLInfoAbout" "https://qtox.github.io"