firstboot: Update help string with --root-shell options

[thirdparty/systemd.git] / tools / meson-vcs-tag.sh

diff --git a/tools/meson-vcs-tag.sh b/tools/meson-vcs-tag.sh
index c8033d00a172c28c9c4d5671bb4918c5ab3fe505..1c3814d4830b3c523e0fc1cedd7e4c5e947bf98d 100755 (executable)
--- a/tools/meson-vcs-tag.sh
+++ b/tools/meson-vcs-tag.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -eu
 set -o pipefail
@@ -8,11 +8,15 @@ tag="$2"
 fallback="$3"
 
 if [ -n "$tag" ]; then
-        echo "$tag"
-        exit 0
+    echo "$tag"
+    exit 0
 fi
 
 # Apparently git describe has a bug where it always considers the work-tree
 # dirty when invoked with --git-dir (even though 'git status' is happy). Work
 # around this issue by cd-ing to the source directory.
-cd "$dir" && git describe --abbrev=7 --dirty=+ 2>/dev/null | sed 's/^v//' || echo "$fallback"
+cd "$dir"
+# Check that we have either .git/ (a normal clone) or a .git file (a work-tree)
+# and that we don't get confused if a tarball is extracted in a higher-level
+# git repository.
+[ -e .git ] && git describe --abbrev=7 --dirty=+ 2>/dev/null | sed 's/^v//' || echo "$fallback"