From b3f4585b3ff2d9827d8a6826fcb66d02f3f05dc7 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Tue, 24 Sep 2019 09:16:15 +0200 Subject: bumpPkgrel, bumpVersion: correctly handle git submodules --- bumpVersion | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'bumpVersion') diff --git a/bumpVersion b/bumpVersion index 8ccd45116..30523ecd3 100755 --- a/bumpVersion +++ b/bumpVersion @@ -172,6 +172,14 @@ if [ "${paket}" != 'qgis-git' ]; then makepkg -fcsr --noconfirm --asdeps || exit 1 namcap "$(makepkg --packagelist)" || exit 1 fi -git commit PKGBUILD -m "${paket} ${pkgver}-${pkgrel} -> ${remVer}-1" +if [ -d '.git' ] || [ -f '.git' ]; then + makepkg --printsrcinfo > .SRCINFO + git commit 'PKGBUILD' '.SRCINFO' -m "${paket} ${pkgver}-${pkgrel} -> ${remVer}-1" + git push || exit 1 + cd .. + git commit "${paket}" -m "${paket} ${pkgver}-${pkgrel} -> ${remVer}-1" +else + git commit 'PKGBUILD' -m "${paket} ${pkgver}-${pkgrel} -> ${remVer}-1" +fi >&2 echo '... done' -- cgit v1.2.3-70-g09d2