From c409e9adf4a6880820a12c830b621266ac475ce7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Thu, 24 Oct 2019 21:20:58 +0200 Subject: [PATCH] PKGBUILD: fix breakage after pacman 5.2 upgrade --- PKGBUILD | 4 ++-- PKGBUILD.wayland-only | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index a215ccd..99cc7ea 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -19,8 +19,8 @@ optdepends=('xcb-util-errors: better X error messages') source=() pkgver() { - [ -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 + cd ../.git &> /dev/null && git describe --tags --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' || + head -3 ../meson.build | grep version | cut -d "'" -f 2 } build() { diff --git a/PKGBUILD.wayland-only b/PKGBUILD.wayland-only index 7e11e7c..d05a60e 100644 --- a/PKGBUILD.wayland-only +++ b/PKGBUILD.wayland-only @@ -19,8 +19,8 @@ depends=( source=() pkgver() { - [ -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 + cd ../.git &> /dev/null && git describe --tags --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' || + head -3 ../meson.build | grep version | cut -d "'" -f 2 } build() {