summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authororbea <orbea@riseup.net>2023-05-05 07:43:48 -0700
committerorbea <orbea@riseup.net>2023-05-05 08:07:26 -0700
commitc9c16b3c47e13e90bb2213141f6f309e2d474396 (patch)
tree4bc4441b254dd9a218635ce753063c3e4239e198
parent5a5883abe03ec2a4fab3fc97dd1f79ad33440c81 (diff)
downloadaccountsservice-c9c16b3c47e13e90bb2213141f6f309e2d474396.tar.gz
generate-version.sh: fix script inside of a tarballHEADmain
-rwxr-xr-xgenerate-version.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/generate-version.sh b/generate-version.sh
index 3f88bff..8375c86 100755
--- a/generate-version.sh
+++ b/generate-version.sh
@@ -4,11 +4,10 @@ exec 3>&2 2> /dev/null
SRCDIR=$(dirname "$0")
cd "$SRCDIR"
CWD=$(realpath "$PWD")
-TOPLEVEL_WORKING_DIR=$(realpath "$(git rev-parse --show-toplevel)")
exec 2>&3
# If it's not from a git checkout, assume it's from a tarball
-if [ "$TOPLEVEL_WORKING_DIR" != "$CWD" ]; then
+if ! git rev-parse --is-inside-git-dir > /dev/null 2>&1; then
VERSION_FROM_DIR_NAME=$(basename "$CWD" | sed -n 's/^accountsservice-\([^-]*\)$/\1/p')
if [ -n "$VERSION_FROM_DIR_NAME" ]; then