Skip to content

Commit 8a1fc38

Browse files
committed
Fix #43: Favour .ottdrev release file over git version detection
1 parent 395a8d1 commit 8a1fc38

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

findversion.sh

+5-6
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,11 @@ ROOT_DIR=`pwd`
5757
# Determine if we are using a modified version
5858
# Assume the dir is not modified
5959
MODIFIED="0"
60-
if [ -d "$ROOT_DIR/.git" ] || [ -f "$ROOT_DIR/.git" ]; then
60+
if [ -f "$ROOT_DIR/.ottdrev" ]; then
61+
# We are an exported source bundle
62+
cat $ROOT_DIR/.ottdrev
63+
exit
64+
elif [ -d "$ROOT_DIR/.git" ] || [ -f "$ROOT_DIR/.git" ]; then
6165
# We are a git checkout
6266
# Refresh the index to make sure file stat info is in sync, then look for modifications
6367
git update-index --refresh >/dev/null
@@ -91,11 +95,6 @@ if [ -d "$ROOT_DIR/.git" ] || [ -f "$ROOT_DIR/.git" ]; then
9195
ISTAG="0"
9296
ISSTABLETAG="0"
9397
fi
94-
95-
elif [ -f "$ROOT_DIR/.ottdrev" ]; then
96-
# We are an exported source bundle
97-
cat $ROOT_DIR/.ottdrev
98-
exit
9998
else
10099
# We don't know
101100
MODIFIED="1"

0 commit comments

Comments
 (0)