Only look for version.txt in the root
parent
5081fba0cf
commit
399bc7e6e0
|
@ -142,7 +142,7 @@ if [ "$SNAPSHOT" == "stable" ]; then
|
||||||
BRANCH=`git describe --tags $(git rev-list --tags --max-count=1)`;
|
BRANCH=`git describe --tags $(git rev-list --tags --max-count=1)`;
|
||||||
if [ -z "$BRANCH" ]; then
|
if [ -z "$BRANCH" ]; then
|
||||||
# This should only happen in CI environments where tag info isn't available
|
# This should only happen in CI environments where tag info isn't available
|
||||||
BRANCH=$(cat "$(find . -name 'version' -o -name 'version.txt')")
|
BRANCH=$(cat "$(find . -maxdepth 1 -name 'version' -o -name 'version.txt')")
|
||||||
echo "Building branch $BRANCH"
|
echo "Building branch $BRANCH"
|
||||||
fi
|
fi
|
||||||
if [ "$BRANCH" == "" ]; then
|
if [ "$BRANCH" == "" ]; then
|
||||||
|
@ -180,7 +180,7 @@ fi;
|
||||||
echo "git pull..."
|
echo "git pull..."
|
||||||
git pull
|
git pull
|
||||||
# Grab the ZoneMinder version from the contents of the version file
|
# Grab the ZoneMinder version from the contents of the version file
|
||||||
VERSION=$(cat "$(find . -name 'version' -o -name 'version.txt')")
|
VERSION=$(cat "$(find . -maxdepth 1 -name 'version' -o -name 'version.txt')")
|
||||||
if [ -z "$VERSION" ]; then
|
if [ -z "$VERSION" ]; then
|
||||||
exit 1;
|
exit 1;
|
||||||
fi;
|
fi;
|
||||||
|
|
Loading…
Reference in New Issue