From c3f2e74700efbaab824197066401e7b2356b3fe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=82=88?= Date: Wed, 2 May 2018 01:20:44 +0800 Subject: [PATCH] add stretch and bionic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 王邈 --- erlang.sh | 6 +++--- gitlab-ce.sh | 2 +- grafana.sh | 4 ++-- influxdata.sh | 6 +++--- mysql.sh | 8 ++++---- percona.sh | 4 ++-- virtualbox.sh | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/erlang.sh b/erlang.sh index aa2642a..7f1e3d6 100755 --- a/erlang.sh +++ b/erlang.sh @@ -14,8 +14,8 @@ YUM_PATH="${BASE_PATH}/centos" UBUNTU_PATH="${BASE_PATH}/ubuntu" DEBIAN_PATH="${BASE_PATH}/debian" -UBUNTU_VERSIONS=("trusty" "xenial") -DEBIAN_VERSIONS=("wheezy" "jessie") +UBUNTU_VERSIONS=("trusty" "xenial" "bionic") +DEBIAN_VERSIONS=("wheezy" "jessie" "stretch") EL_VERSIONS=("6" "7") # =================== APT repos =============================== @@ -50,7 +50,7 @@ keepcache=0 EOF for elver in ${EL_VERSIONS[@]}; do -cat << EOF >> $cfg +cat << EOF >> $cfg [$elver] name=Elang for el-${elver} baseurl=${BASE_URL}/rpm/centos/$elver/x86_64 diff --git a/gitlab-ce.sh b/gitlab-ce.sh index dcfa295..9f48ec8 100755 --- a/gitlab-ce.sh +++ b/gitlab-ce.sh @@ -13,7 +13,7 @@ BASE_PATH="${TUNASYNC_WORKING_DIR}" YUM_PATH="${BASE_PATH}/yum" -UBUNTU_VERSIONS=("trusty" "wily" "xenial") +UBUNTU_VERSIONS=("trusty" "xenial" "bionic") DEBIAN_VERSIONS=("wheezy" "jessie" "stretch") UBUNTU_PATH="${BASE_PATH}/ubuntu/" DEBIAN_PATH="${BASE_PATH}/debian/" diff --git a/grafana.sh b/grafana.sh index afb6b50..a706415 100755 --- a/grafana.sh +++ b/grafana.sh @@ -14,7 +14,7 @@ BASE_URL=${TUNASYNC_UPSTREAM_URL:-"https://packagecloud.io/grafana/stable"} YUM_PATH="${BASE_PATH}/yum" APT_PATH="${BASE_PATH}/apt" -APT_VERSIONS=("wheezy" "jessie") +APT_VERSIONS=("wheezy" "jessie" "stretch") EL_VERSIONS=("6" "7") mkdir -p ${YUM_PATH} ${APT_PATH} @@ -44,7 +44,7 @@ keepcache=0 EOF for elver in ${EL_VERSIONS[@]}; do -cat << EOF >> $cfg +cat << EOF >> $cfg [el${elver}] name=el${elver} baseurl=${BASE_URL}/el/$elver/x86_64/ diff --git a/influxdata.sh b/influxdata.sh index c1549f9..f1cc70e 100755 --- a/influxdata.sh +++ b/influxdata.sh @@ -15,8 +15,8 @@ YUM_PATH="${BASE_PATH}/yum" UBUNTU_PATH="${BASE_PATH}/ubuntu" DEBIAN_PATH="${BASE_PATH}/debian" -UBUNTU_VERSIONS=("trusty" "xenial") -DEBIAN_VERSIONS=("wheezy" "jessie") +UBUNTU_VERSIONS=("trusty" "xenial" "bionic") +DEBIAN_VERSIONS=("wheezy" "jessie" "stretch") EL_VERSIONS=("6" "7") mkdir -p ${YUM_PATH} ${UBUNTU_PATH} ${DEBIAN_PATH} @@ -55,7 +55,7 @@ keepcache=0 EOF for elver in ${EL_VERSIONS[@]}; do -cat << EOF >> $cfg +cat << EOF >> $cfg [el${elver}-x86_64] name=el${elver} baseurl=${BASE_URL}/rhel/$elver/x86_64/stable/ diff --git a/mysql.sh b/mysql.sh index 0c98e21..fa54354 100755 --- a/mysql.sh +++ b/mysql.sh @@ -24,8 +24,8 @@ APT_PATH="${BASE_PATH}/apt" UBUNTU_PATH="${APT_PATH}/ubuntu" DEBIAN_PATH="${APT_PATH}/debian" -UBUNTU_VERSIONS=("trusty" "precise" "xenial") -DEBIAN_VERSIONS=("wheezy" "jessie") +UBUNTU_VERSIONS=("trusty" "precise" "xenial" "bionic") +DEBIAN_VERSIONS=("wheezy" "jessie" "stretch") mkdir -p ${YUM_PATH} ${UBUNTU_PATH} ${DEBIAN_PATH} @@ -36,7 +36,7 @@ if [[ ! -z ${DRY_RUN:-} ]]; then export APT_DRY_RUN=1 fi MYSQL_APT_REPOS=("mysql-5.6" "mysql-5.7" "mysql-tools" "connector-python-2.1") - + base_url="${BASE_URL}/apt/ubuntu" for version in ${UBUNTU_VERSIONS[@]}; do for repo in ${MYSQL_APT_REPOS[@]}; do @@ -69,7 +69,7 @@ keepcache=0 EOF for elver in "6" "7"; do -cat << EOF >> $cfg +cat << EOF >> $cfg [mysql-connectors-community-el${elver}] name=MySQL Connectors Community baseurl=http://repo.mysql.com/yum/mysql-connectors-community/el/$elver/x86_64/ diff --git a/percona.sh b/percona.sh index f20b6bf..d94026c 100755 --- a/percona.sh +++ b/percona.sh @@ -14,7 +14,7 @@ BASE_URL=${TUNASYNC_UPSTREAM_URL:-"https://repo.percona.com"} YUM_PATH="${BASE_PATH}/yum" APT_PATH="${BASE_PATH}/apt" -APT_VERSIONS=("wheezy" "jessie" "trusty" "xenial") +APT_VERSIONS=("wheezy" "jessie" "trusty" "xenial" "stretch" "bionic") EL_VERSIONS=("6" "7") mkdir -p ${YUM_PATH} ${APT_PATH} @@ -43,7 +43,7 @@ keepcache=0 EOF for elver in ${EL_VERSIONS[@]}; do -cat << EOF >> $cfg +cat << EOF >> $cfg [el${elver}] name=el${elver} baseurl=${BASE_URL}/centos/$elver/os/x86_64/ diff --git a/virtualbox.sh b/virtualbox.sh index 213ce1b..123b373 100755 --- a/virtualbox.sh +++ b/virtualbox.sh @@ -15,7 +15,7 @@ BASE_PATH="${TUNASYNC_WORKING_DIR}" RPM_PATH="${BASE_PATH}/rpm" APT_PATH="${BASE_PATH}/apt" -APT_VERSIONS=("xenial" "trusty" "precise" "stretch" "jessie" "wheezy" "squeeze") +APT_VERSIONS=("xenial" "trusty" "precise" "stretch" "jessie" "wheezy" "squeeze" "bionic") EL_VERSIONS=("5" "6" "7") mkdir -p ${RPM_PATH} ${APT_PATH} @@ -79,7 +79,7 @@ while read line; do dest_filename="${LATEST_PATH}/${filename}" pkg_url="${BASE_URL}/${LATEST_VERSION}/${filename}" - + declare downloaded=false if [[ -f ${dest_filename} ]]; then @@ -100,7 +100,7 @@ while read line; do downloaded=true fi done - + case $filename in *Win.exe) ln -sf ${dest_filename} ${BASE_PATH}/virtualbox-Win-latest.exe