From 8ddee56c38d2538f053b13b1fdeebb2a2c40a6af Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 2 Jul 2018 14:36:46 +0000 Subject: [PATCH] We now have our own repo for rspamd + should manage the version number directly in the changelog --- init.sh | 2 +- scripts/ynh-custom-builds | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/init.sh b/init.sh index 10c5888..0d87bfd 100755 --- a/init.sh +++ b/init.sh @@ -25,7 +25,7 @@ git clone https://github.com/yunohost/yunohost-admin git clone https://github.com/yunohost/ssowat SSOwat git clone https://github.com/yunohost/moulinette git clone https://github.com/yunohost/metronome -git clone https://github.com/vstakhov/rspamd +git clone https://github.com/YunoHost/rspamd git clone https://git.donarmstrong.com/unscd.git cd yunohost diff --git a/scripts/ynh-custom-builds b/scripts/ynh-custom-builds index 0917ddb..e44c999 100755 --- a/scripts/ynh-custom-builds +++ b/scripts/ynh-custom-builds @@ -62,13 +62,7 @@ function tweak_unscd() function tweak_rspamd() { - git checkout master - git pull origin master - - # Get last tag and deduce version number to user... - local LASTTAG=$(git tag --list | grep "^1." | sort -n | tail -n1) - readonly VERSION="${LASTTAG}+yunohost" - git checkout $LASTTAG + readonly VERSION="$(dpkg-parsechangelog -S Version 2>/dev/null)+yunohost" } function build()