From fea45f977908591fcf238a78f0f51e8d242a6bc3 Mon Sep 17 00:00:00 2001 From: bigeagle Date: Thu, 1 Sep 2016 17:28:11 +0800 Subject: [PATCH] grafana has not debian/ubuntu sepration --- grafana.sh | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/grafana.sh b/grafana.sh index 59f6a89..719e86b 100755 --- a/grafana.sh +++ b/grafana.sh @@ -12,33 +12,23 @@ BASE_PATH="${TUNASYNC_WORKING_DIR}" BASE_URL=${TUNASYNC_UPSTREAM_URL:-"https://packagecloud.io/grafana/stable"} YUM_PATH="${BASE_PATH}/yum" -UBUNTU_PATH="${BASE_PATH}/ubuntu" -DEBIAN_PATH="${BASE_PATH}/debian" +APT_PATH="${BASE_PATH}/apt" -UBUNTU_VERSIONS=("trusty" "xenial") -DEBIAN_VERSIONS=("wheezy" "jessie") +APT_VERSIONS=("wheezy" "jessie") EL_VERSIONS=("6" "7") -mkdir -p ${YUM_PATH} ${UBUNTU_PATH} ${DEBIAN_PATH} +mkdir -p ${YUM_PATH} ${APT_PATH} # =================== APT repos =============================== # export APT_DRY_RUN=0 -base_url="${BASE_URL}/ubuntu" -for version in ${UBUNTU_VERSIONS[@]}; do - for arch in "amd64" "i386"; do - apt-download-binary ${base_url} "$version" "main" "$arch" "${UBUNTU_PATH}" || true - done -done -echo "Ubuntu finished" - base_url="${BASE_URL}/debian" -for version in ${DEBIAN_VERSIONS[@]}; do +for version in ${APT_VERSIONS[@]}; do for arch in "amd64" "i386"; do - apt-download-binary ${base_url} "$version" "main" "$arch" "${DEBIAN_PATH}" || true + apt-download-binary ${base_url} "$version" "main" "$arch" "${APT_PATH}" || true done done -echo "Debian finished" +echo "APT finished" # =================== YUM/DNF repos ==========================