Skip to content

Commit 230309b

Browse files
authored
Update install-nim-bundle.sh (#208)
1 parent cce41c8 commit 230309b

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

static/scripts/install-nim-bundle.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -566,8 +566,9 @@ This action deletes all files in the following directories: /etc/nms , /etc/ngin
566566
getLatestPkgVersionFromRepo(){
567567
repoUrl=$1
568568
version=$2
569-
if [[ "$repoUrl" == *"packages.clickhouse.com"* ]]; then
570-
response=$(curl -sL "${repoUrl}" | awk -F'[<>"]' '/href=.*\.(deb|rpm)/ {print $5}' | grep -E "$version" | sort -t'_' -k2,2V | tac)
569+
pkg_extension=$3
570+
if [[ "${pkg_extension}" == "rpm" ]]; then
571+
response=$(curl --cert ${NGINX_CERT_PATH} --key ${NGINX_CERT_KEY_PATH} -sL "${repoUrl}" | awk -F '"' '/href=/ {print $2}' | grep -E "$version"| sort -t'-' -k4,4V | tac)
571572
readarray -t versions < <(printf "%s" "${response}")
572573
else
573574
response=$(curl --cert ${NGINX_CERT_PATH} --key ${NGINX_CERT_KEY_PATH} -sL "${repoUrl}" | awk -F '"' '/href=/ {print $2}' | grep -E "$version"| sort -t'_' -k2,2V | tac)
@@ -605,7 +606,7 @@ package_nim_offline(){
605606
NGINX_PLUS_PACKAGE="^nginx-plus-[0-9]+-([0-9]+)${OS_DISTRO_MAP[${TARGET_DISTRIBUTION}]}\.${PKG_EXTENSION}$"
606607
fi
607608
echo "regex for looking latest version : ${NGINX_PLUS_PACKAGE}"
608-
NGINX_PLUS_VERSION=$(getLatestPkgVersionFromRepo "${NGINX_PLUS_REPO[${TARGET_DISTRIBUTION}]}" "${NGINX_PLUS_PACKAGE}")
609+
NGINX_PLUS_VERSION=$(getLatestPkgVersionFromRepo "${NGINX_PLUS_REPO[${TARGET_DISTRIBUTION}]}" "${NGINX_PLUS_PACKAGE}" "${PKG_EXTENSION}")
609610
echo "latest version for nginx_plus is ${NGINX_PLUS_VERSION}"
610611
echo "Downloading ${NGINX_PLUS_REPO[${TARGET_DISTRIBUTION}]}/${NGINX_PLUS_VERSION}...."
611612
curl -sfLO --cert ${NGINX_CERT_PATH} --key ${NGINX_CERT_KEY_PATH} "${NGINX_PLUS_REPO[${TARGET_DISTRIBUTION}]}/${NGINX_PLUS_VERSION}"
@@ -616,7 +617,7 @@ package_nim_offline(){
616617
NGINX_OSS_PACKAGE="^nginx-[0-9]+\.[0-9]+\.[0-9]+-([0-9]+)${OS_DISTRO_MAP[${TARGET_DISTRIBUTION}]}\.${PKG_EXTENSION}$"
617618
fi
618619
echo "fetching latest version using ${NGINX_OSS_PACKAGE}"
619-
NGINX_OSS_VERSION=$(getLatestPkgVersionFromRepo "${NGINX_REPO[${TARGET_DISTRIBUTION}]}" "${NGINX_OSS_PACKAGE}")
620+
NGINX_OSS_VERSION=$(getLatestPkgVersionFromRepo "${NGINX_REPO[${TARGET_DISTRIBUTION}]}" "${NGINX_OSS_PACKAGE}" "${PKG_EXTENSION}")
620621
echo "latest version for nginx is ${NGINX_OSS_VERSION}"
621622
echo "Downloading ${NGINX_REPO[${TARGET_DISTRIBUTION}]}/${NGINX_OSS_VERSION}...."
622623
curl -sfLO "${NGINX_REPO[${TARGET_DISTRIBUTION}]}/${NGINX_OSS_VERSION}"
@@ -651,7 +652,7 @@ package_nim_offline(){
651652
if [[ "${PKG_EXTENSION}" == "rpm" ]]; then
652653
NIM_PACKAGE_PATH="^nms-instance-manager-[0-9]+\.[0-9]+\.[0-9]+-([0-9]+)${OS_DISTRO_MAP[${TARGET_DISTRIBUTION}]}\.${PKG_EXTENSION}$"
653654
fi
654-
NIM_PACKAGE_VERSION=$(getLatestPkgVersionFromRepo "${NIM_REPO[${TARGET_DISTRIBUTION}]}" "${NIM_PACKAGE_PATH}")
655+
NIM_PACKAGE_VERSION=$(getLatestPkgVersionFromRepo "${NIM_REPO[${TARGET_DISTRIBUTION}]}" "${NIM_PACKAGE_PATH}" "${PKG_EXTENSION}")
655656
echo "Latest version for nginx instance manager is ${NIM_PACKAGE_VERSION}...."
656657
curl -sfLO --cert ${NGINX_CERT_PATH} --key ${NGINX_CERT_KEY_PATH} "${NIM_REPO[${TARGET_DISTRIBUTION}]}/${NIM_PACKAGE_VERSION}"
657658
check_last_command_status "curl -sfLO --cert ${NGINX_CERT_PATH} --key ${NGINX_CERT_KEY_PATH} \"${NIM_REPO[${TARGET_DISTRIBUTION}]}/${NIM_PACKAGE_VERSION}\"" $?

0 commit comments

Comments
 (0)