From 660d8165f5a5dfa676e5f0b37df919c3b75f50d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Tue, 7 May 2019 21:41:29 +0200 Subject: [PATCH] PKGBUILD: add support for building from a non-git cloned source dir --- PKGBUILD | 3 ++- PKGBUILD.wayland-only | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index ef9766d..f6faaab 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -19,7 +19,8 @@ optdepends=('xcb-util-errors: better X error messages') source=() pkgver() { - git describe --tags --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' + [ -d ../.git ] && git describe --tags --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' + [ ! -d ../.git ] && head -3 ../meson.build | grep version | cut -d "'" -f 2 } build() { diff --git a/PKGBUILD.wayland-only b/PKGBUILD.wayland-only index 2dde165..7660b97 100644 --- a/PKGBUILD.wayland-only +++ b/PKGBUILD.wayland-only @@ -19,7 +19,8 @@ depends=( source=() pkgver() { - git describe --tags --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' + [ -d ../.git ] && git describe --tags --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' + [ ! -d ../.git ] && head -3 ../meson.build | grep version | cut -d "'" -f 2 } build() {