|
@@ -58,6 +58,10 @@ function yetus_abs
|
|
|
return 1
|
|
|
}
|
|
|
|
|
|
+function version_ge()
|
|
|
+{
|
|
|
+ test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1";
|
|
|
+}
|
|
|
|
|
|
WANTED="$1"
|
|
|
shift
|
|
@@ -67,11 +71,17 @@ HADOOP_YETUS_VERSION=${HADOOP_YETUS_VERSION:-0.13.0}
|
|
|
BIN=$(yetus_abs "${BASH_SOURCE-$0}")
|
|
|
BINDIR=$(dirname "${BIN}")
|
|
|
|
|
|
+## HADOOP_YETUS_VERSION >= 0.9.0 the tarball named with apache-yetus prefix
|
|
|
+if version_ge "${HADOOP_YETUS_VERSION}" "0.9.0"; then
|
|
|
+ YETUS_PREFIX=apache-yetus
|
|
|
+else
|
|
|
+ YETUS_PREFIX=yetus
|
|
|
+fi
|
|
|
+
|
|
|
###
|
|
|
### if YETUS_HOME is set, then try to use it
|
|
|
###
|
|
|
-if [[ -n "${YETUS_HOME}"
|
|
|
- && -x "${YETUS_HOME}/bin/${WANTED}" ]]; then
|
|
|
+if [[ -n "${YETUS_HOME}" && -x "${YETUS_HOME}/bin/${WANTED}" ]]; then
|
|
|
exec "${YETUS_HOME}/bin/${WANTED}" "${ARGV[@]}"
|
|
|
fi
|
|
|
|
|
@@ -94,8 +104,8 @@ HADOOP_PATCHPROCESS=${mytmpdir}
|
|
|
##
|
|
|
## if we've already DL'd it, then short cut
|
|
|
##
|
|
|
-if [[ -x "${HADOOP_PATCHPROCESS}/yetus-${HADOOP_YETUS_VERSION}/bin/${WANTED}" ]]; then
|
|
|
- exec "${HADOOP_PATCHPROCESS}/yetus-${HADOOP_YETUS_VERSION}/bin/${WANTED}" "${ARGV[@]}"
|
|
|
+if [[ -x "${HADOOP_PATCHPROCESS}/${YETUS_PREFIX}-${HADOOP_YETUS_VERSION}/bin/${WANTED}" ]]; then
|
|
|
+ exec "${HADOOP_PATCHPROCESS}/${YETUS_PREFIX}-${HADOOP_YETUS_VERSION}/bin/${WANTED}" "${ARGV[@]}"
|
|
|
fi
|
|
|
|
|
|
##
|
|
@@ -103,7 +113,7 @@ fi
|
|
|
##
|
|
|
|
|
|
BASEURL="https://archive.apache.org/dist/yetus/${HADOOP_YETUS_VERSION}/"
|
|
|
-TARBALL="yetus-${HADOOP_YETUS_VERSION}-bin.tar"
|
|
|
+TARBALL="${YETUS_PREFIX}-${HADOOP_YETUS_VERSION}-bin.tar"
|
|
|
|
|
|
GPGBIN=$(command -v gpg)
|
|
|
CURLBIN=$(command -v curl)
|
|
@@ -164,9 +174,9 @@ if [[ $? != 0 ]]; then
|
|
|
exit 1
|
|
|
fi
|
|
|
|
|
|
-if [[ -x "${HADOOP_PATCHPROCESS}/yetus-${HADOOP_YETUS_VERSION}/bin/${WANTED}" ]]; then
|
|
|
+if [[ -x "${HADOOP_PATCHPROCESS}/${YETUS_PREFIX}-${HADOOP_YETUS_VERSION}/bin/${WANTED}" ]]; then
|
|
|
popd >/dev/null
|
|
|
- exec "${HADOOP_PATCHPROCESS}/yetus-${HADOOP_YETUS_VERSION}/bin/${WANTED}" "${ARGV[@]}"
|
|
|
+ exec "${HADOOP_PATCHPROCESS}/${YETUS_PREFIX}-${HADOOP_YETUS_VERSION}/bin/${WANTED}" "${ARGV[@]}"
|
|
|
fi
|
|
|
|
|
|
##
|