installer scripts handle -t differently in git clones now than in svn checkouts.

./release.sh -t will now get the release name from `git describe --tags` (fixes issue 2588)

installer/jar/makeJar.sh

@@ -119,13 +119,18 @@ while test -n "$1"; do
 			;;
 		--tag|-t)
 			shift
-			REGEX="^[0-9]+(\.[0-9]+(\.[0-9]+)?)?$"
-			CHECKTAG=`echo ${1} | egrep "${REGEX}"`
-			if [ "" = "${CHECKTAG}" ]; then
-				echo "Specified tag ("${1}") is invalid."
-				exit 1;
+			if [ ${isSVN} -eq 1 ]; then
+				REGEX="^[0-9]+(\.[0-9]+(\.[0-9]+)?)?$"
+				CHECKTAG=`echo ${1} | egrep "${REGEX}"`
+				if [ "" = "${CHECKTAG}" ]; then
+					echo "Specified tag ("${1}") is invalid."
+					exit 1;
+				fi;
+				TAGGED="${1}"
+			else
+				TAGGED=`git describe --tags`
+				TAGGED=${TAGGED%%-*}
 			fi;
-			TAGGED="${1}"
 			;;
 	esac
 	shift

installer/linux/makeInstallerLinux.sh

@@ -186,13 +186,18 @@ while test -n "$1"; do
 			;;
 		--tag|-t)
 			shift
-			REGEX="^[0-9]+(\.[0-9]+(\.[0-9]+)?)?$"
-			CHECKTAG=`echo ${1} | egrep "${REGEX}"`
-			if [ "" = "${CHECKTAG}" ]; then
-				echo "Specified tag ("${1}") is invalid."
-				exit 1;
+			if [ ${isSVN} -eq 1 ]; then
+				REGEX="^[0-9]+(\.[0-9]+(\.[0-9]+)?)?$"
+				CHECKTAG=`echo ${1} | egrep "${REGEX}"`
+				if [ "" = "${CHECKTAG}" ]; then
+					echo "Specified tag ("${1}") is invalid."
+					exit 1;
+				fi;
+				TAGGED="${1}"
+			else
+				TAGGED=`git describe --tags`
+				TAGGED=${TAGGED%%-*}
 			fi;
-			TAGGED="${1}"
 			;;
 	esac
 	shift

installer/osx/makeInstallerOSX.sh

@@ -172,13 +172,18 @@ while test -n "$1"; do
 			;;
 		--tag|-t)
 			shift
-			REGEX="^[0-9]+(\.[0-9]+(\.[0-9]+)?)?$"
-			CHECKTAG=`echo ${1} | egrep "${REGEX}"`
-			if [ "" = "${CHECKTAG}" ]; then
-				echo "Specified tag ("${1}") is invalid."
-				exit 1;
+			if [ ${isSVN} -eq 1 ]; then
+				REGEX="^[0-9]+(\.[0-9]+(\.[0-9]+)?)?$"
+				CHECKTAG=`echo ${1} | egrep "${REGEX}"`
+				if [ "" = "${CHECKTAG}" ]; then
+					echo "Specified tag ("${1}") is invalid."
+					exit 1;
+				fi;
+				TAGGED="${1}"
+			else
+				TAGGED=`git describe --tags`
+				TAGGED=${TAGGED%%-*}
 			fi;
-			TAGGED="${1}"
 			;;
 	esac
 	shift

installer/release.sh

@@ -33,7 +33,7 @@ showHelp() {
 	if [ ${isSVN} -eq 1 ]; then
 		echo "-b,  --branch                       <release> is a branch"
 	else
-		echo "-t,  --tag <release>                This is a tagged release"
+		echo "-t,  --tag                          This is a tagged release"
 	fi;
 	echo "     --jar <file>                   Use <file> instead of compiling a jar."
 	echo "     --fulljar <file>               Use <file> instead of compiling a jar, and don't run makeJar on it."
@@ -112,13 +112,17 @@ while test -n "$1"; do
 			;;
 		--tag|-t)
 			shift
-			REGEX="^[0-9]+(\.[0-9]+(\.[0-9]+)?)?$"
-			CHECKTAG=`echo ${1} | egrep "${REGEX}"`
-			if [ "" = "${CHECKTAG}" ]; then
-				echo "Specified tag ("${1}") is invalid."
-				exit 1;
+			if [ ${isSVN} -eq 1 ]; then
+				REGEX="^[0-9]+(\.[0-9]+(\.[0-9]+)?)?$"
+				CHECKTAG=`echo ${1} | egrep "${REGEX}"`
+				if [ "" = "${CHECKTAG}" ]; then
+					echo "Specified tag ("${1}") is invalid."
+					exit 1;
+				fi;
+				TAGGED="-t ${1} "
+			else
+				TAGGED="-t "
 			fi;
-			TAGGED="-t ${1} "
 			;;
 	esac
 	shift

installer/windows/makeInstallerWindows.sh

@@ -205,13 +205,18 @@ while test -n "$1"; do
 			;;
 		--tag|-t)
 			shift
-			REGEX="^[0-9]+(\.[0-9]+(\.[0-9]+)?)?$"
-			CHECKTAG=`echo ${1} | egrep "${REGEX}"`
-			if [ "" = "${CHECKTAG}" ]; then
-				echo "Specified tag ("${1}") is invalid."
-				exit 1;
+			if [ ${isSVN} -eq 1 ]; then
+				REGEX="^[0-9]+(\.[0-9]+(\.[0-9]+)?)?$"
+				CHECKTAG=`echo ${1} | egrep "${REGEX}"`
+				if [ "" = "${CHECKTAG}" ]; then
+					echo "Specified tag ("${1}") is invalid."
+					exit 1;
+				fi;
+				TAGGED="${1}"
+			else
+				TAGGED=`git describe --tags`
+				TAGGED=${TAGGED%%-*}
 			fi;
-			TAGGED="${1}"
 			;;
 	esac
 	shift