From b640945618d32262f18d02bf732eefc892f3f567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gardais=20J=C3=A9r=C3=A9my?= Date: Tue, 13 Aug 2019 14:10:10 +0200 Subject: [PATCH] Check current version of SSP from .deb file --- github/check.self-service-password.update | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/github/check.self-service-password.update b/github/check.self-service-password.update index 4ee31b3..150e267 100755 --- a/github/check.self-service-password.update +++ b/github/check.self-service-password.update @@ -42,15 +42,22 @@ fi # }}} # Vars {{{ -DEBUG=0 +DEBUG=1 script_wd=$(dirname "${0}") -ssp_install_dir="${1}" -ssp_current_version=$(cd "${ssp_install_dir}" || exit 1 ; git status | head -n1 | cut -d" " -f4 | sed 's/v//g' ; cd - > /dev/null || exit 1) - ssp_repo_url="https://github.com/ltb-project/self-service-password" -ssp_new_version=$("${script_wd}"/releasetags "${ssp_repo_url}" | head -n1 | sed 's/v//g') +if [ $# -eq 1 ] ## If source directory should be used +then + ssp_install_dir="${1}" + ssp_current_version=$(cd "${ssp_install_dir}" || exit 1 ; git status | head -n1 | cut -d" " -f4 ; cd - > /dev/null || exit 1) + + ssp_new_version=$("${script_wd}"/releasetags "${ssp_repo_url}" | head -n1) +else ## If .deb file should be used + ssp_current_version=$(dpkg -l self-service-password | awk '/^ii.*self-service-password/ { print $3}' | sed 's/\(.*\)-.*/\1/') + + ssp_new_version=$("${script_wd}"/releasetags "${ssp_repo_url}" | head -n1 | sed 's/v//g') +fi ssp_new_version_file="/tmp/.github.self-service-password.upgrade" # }}}