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() {