diff options
| -rwxr-xr-x | generate-version.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/generate-version.sh b/generate-version.sh index c2ccef7..0eb492d 100755 --- a/generate-version.sh +++ b/generate-version.sh @@ -1,8 +1,13 @@ #!/bin/sh +exec 3>&2 2> /dev/null +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 [ "$(git rev-parse c5339c5779a67330afbb9406135a7148922478ae)" != "c5339c5779a67330afbb9406135a7148922478ae" ]; then - VERSION_FROM_DIR_NAME=$(dirname $PWD/.. | sed -n 's/^accountsservice-\([^-]*\)$/\1/p') +if [ "$TOPLEVEL_WORKING_DIR" != "$CWD" ]; then + VERSION_FROM_DIR_NAME=$(basename "$CWD" | sed -n 's/^accountsservice-\([^-]*\)$/\1/p') if [ -n "$VERSION_FROM_DIR_NAME" ]; then echo "$VERSION_FROM_DIR_NAME" |