From f9c24657919fa3bfc50ad78416d478effca60831 Mon Sep 17 00:00:00 2001
From: z4yx <z4yx@users.noreply.github.com>
Date: Sun, 5 Apr 2020 14:33:32 +0800
Subject: [PATCH] migrating k8s,ros2

---
 kubernetes.sh | 17 +++--------------
 ros2.sh       | 19 +++----------------
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/kubernetes.sh b/kubernetes.sh
index 113982f..8687b58 100755
--- a/kubernetes.sh
+++ b/kubernetes.sh
@@ -4,9 +4,7 @@ set -e
 set -o pipefail
 
 _here=`dirname $(realpath $0)`
-. ${_here}/helpers/apt-download
-
-[ -z "${LOADED_APT_DOWNLOAD}" ] && (echo "failed to load apt-download"; exit 1)
+apt_sync="${_here}/apt-sync.py"
 
 BASE_PATH="${TUNASYNC_WORKING_DIR}"
 BASE_URL=${TUNASYNC_UPSTREAM_URL:-"https://packages.cloud.google.com"}
@@ -14,23 +12,14 @@ BASE_URL=${TUNASYNC_UPSTREAM_URL:-"https://packages.cloud.google.com"}
 YUM_PATH="${BASE_PATH}/yum/repos"
 APT_PATH="${BASE_PATH}/apt"
 
-APT_VERSIONS=(kubernetes-jessie kubernetes-stretch kubernetes-trusty kubernetes-xenial minikube-jessie minikube-trusty)
+APT_VERSIONS=kubernetes-jessie,kubernetes-stretch,kubernetes-trusty,kubernetes-xenial,minikube-jessie,minikube-trusty
 EL_VERSIONS=(kubernetes-el7-aarch64 kubernetes-el7-armhfp kubernetes-el7-x86_64)
 
 mkdir -p ${YUM_PATH} ${APT_PATH}
 
 
 # =================== APT repos ===============================
-if [[ ! -z ${DRY_RUN:-} ]]; then
-	export APT_DRY_RUN=1
-fi
-base_url="${BASE_URL}/apt"
-for version in ${APT_VERSIONS[@]}; do
-	for arch in "amd64" "i386" "arm64" "armhf"; do
-		echo "=== Syncing $version $arch"
-		apt-download-binary ${base_url} "$version" "main" "$arch" "${APT_PATH}" || true
-	done
-done
+"$apt_sync" "${BASE_URL}/apt" $APT_VERSIONS main amd64,i386,armhf,arm64 "$APT_PATH"
 echo "APT finished"
 
 # =================== YUM/DNF repos ==========================
diff --git a/ros2.sh b/ros2.sh
index ee40e43..8810915 100755
--- a/ros2.sh
+++ b/ros2.sh
@@ -4,27 +4,14 @@ set -e
 set -o pipefail
 
 _here=`dirname $(realpath $0)`
-. ${_here}/helpers/apt-download
-
-[ -z "${LOADED_APT_DOWNLOAD}" ] && (echo "failed to load apt-download"; exit 1)
+apt_sync="${_here}/apt-sync.py"
 
 BASE_PATH="${TUNASYNC_WORKING_DIR}"
 BASE_URL=${TUNASYNC_UPSTREAM_URL:-"http://packages.ros.org/ros2"}
 
 APT_PATH="${BASE_PATH}/ubuntu"
-
-APT_VERSIONS=(bionic buster cosmic disco eoan focal stretch xenial)
+APT_VERSIONS=@ubuntu-lts,disco,eoan,focal,@debian-current
 
 # =================== APT repos ===============================
-if [[ ! -z ${DRY_RUN:-} ]]; then
-	export APT_DRY_RUN=1
-fi
-mkdir -p ${APT_PATH}
-base_url="${BASE_URL}/ubuntu"
-for version in ${APT_VERSIONS[@]}; do
-	for arch in "amd64" "arm64" "armhf"; do
-		echo "=== Syncing $version $arch"
-		apt-download-binary "${base_url}" "$version" "main" "$arch" "${APT_PATH}" || true
-	done
-done
+"$apt_sync" "${BASE_URL}/ubuntu" $APT_VERSIONS main amd64,armhf,arm64 "$APT_PATH"
 echo "APT finished"