diff --git a/ELK.sh b/ELK.sh index 89aa3b3..021c2de 100755 --- a/ELK.sh +++ b/ELK.sh @@ -19,9 +19,6 @@ declare -A REPO_VERSIONS=( ) # =================== APT repos =============================== -if [[ ! -z ${DRY_RUN:-} ]]; then - export APT_DRY_RUN=1 -fi for repo in "${!REPO_VERSIONS[@]}"; do # magic here, don't quote ${REPO_VERSIONS[$repo][@]} @@ -30,7 +27,7 @@ for repo in "${!REPO_VERSIONS[@]}"; do echo $repo-$version apt_url="${BASE_URL}/${repo}/${version}/debian" dest_path="${APT_PATH}/${repo}/${version}" - "$apt_sync" "$apt_url" stable main amd64,i386 "$dest_path" + "$apt_sync" --delete-dry-run "$apt_url" stable main amd64,i386 "$dest_path" done done diff --git a/chef.sh b/chef.sh index 61d34eb..ed699ba 100755 --- a/chef.sh +++ b/chef.sh @@ -15,7 +15,7 @@ APT_PATH="${BASE_PATH}/apt/stable" "$yum_sync" "${UPSTREAM}/yum/stable/el/@{os_ver}/@{arch}" 6-8 chef x86_64 "stable-el@{os_ver}-@{arch}" "$YUM_PATH" echo "YUM finished" -"$apt_sync" "${UPSTREAM}/apt/stable" @ubuntu-lts,@debian-current main amd64,i386,aarch64 "$APT_PATH" +"$apt_sync" --delete-dry-run "${UPSTREAM}/apt/stable" @ubuntu-lts,@debian-current main amd64,i386,aarch64 "$APT_PATH" echo "APT finished" # vim: ts=4 sts=4 sw=4 diff --git a/elastic.sh b/elastic.sh index a36549d..2e24cf7 100755 --- a/elastic.sh +++ b/elastic.sh @@ -19,7 +19,7 @@ APT_PATH="${BASE_PATH}/apt" # =================== APT repos =============================== for elsver in "${ELASTIC_VERSION[@]}"; do - "$apt_sync" "${BASE_URL}/packages/${elsver}/apt" stable main amd64,i386 "${APT_PATH}/${elsver}" + "$apt_sync" --delete-dry-run "${BASE_URL}/packages/${elsver}/apt" stable main amd64,i386 "${APT_PATH}/${elsver}" (cd ${BASE_PATH}/${elsver}; ln -sfn ../apt/${elsver} apt) done diff --git a/erlang.sh b/erlang.sh index a1514d5..8a9f23f 100755 --- a/erlang.sh +++ b/erlang.sh @@ -14,9 +14,9 @@ UBUNTU_PATH="${BASE_PATH}/ubuntu" DEBIAN_PATH="${BASE_PATH}/debian" # =================== APT repos =============================== -"$apt_sync" "${BASE_URL}/ubuntu" @ubuntu-lts contrib amd64,i386 "$UBUNTU_PATH" +"$apt_sync" --delete-dry-run "${BASE_URL}/ubuntu" @ubuntu-lts contrib amd64,i386 "$UBUNTU_PATH" echo "Ubuntu finished" -"$apt_sync" "${BASE_URL}/debian" @debian-current contrib amd64,i386 "$DEBIAN_PATH" +"$apt_sync" --delete-dry-run "${BASE_URL}/debian" @debian-current contrib amd64,i386 "$DEBIAN_PATH" echo "Debian finished" # =================== YUM repos =============================== diff --git a/gitlab-ce.sh b/gitlab-ce.sh index 4ab2f63..f0e9768 100755 --- a/gitlab-ce.sh +++ b/gitlab-ce.sh @@ -17,9 +17,9 @@ DEBIAN_PATH="${BASE_PATH}/debian/" "$yum_sync" "${UPSTREAM}/el/@{os_ver}/@{arch}/" 6-8 "gitlab" x86_64 "el@{os_ver}" "$YUM_PATH" echo "YUM finished" -"$apt_sync" "${UPSTREAM}/ubuntu" @ubuntu-lts main amd64,i386 "$UBUNTU_PATH" +"$apt_sync" --delete-dry-run "${UPSTREAM}/ubuntu" @ubuntu-lts main amd64,i386 "$UBUNTU_PATH" echo "Ubuntu finished" -"$apt_sync" "${UPSTREAM}/debian" @debian-current main amd64,i386 "$DEBIAN_PATH" +"$apt_sync" --delete-dry-run "${UPSTREAM}/debian" @debian-current main amd64,i386 "$DEBIAN_PATH" echo "Debian finished" diff --git a/gitlab-ci-multi-runner.sh b/gitlab-ci-multi-runner.sh index 4f2e4cf..5a12851 100755 --- a/gitlab-ci-multi-runner.sh +++ b/gitlab-ci-multi-runner.sh @@ -17,9 +17,9 @@ DEBIAN_PATH="${BASE_PATH}/debian/" "$yum_sync" "${UPSTREAM}/el/@{os_ver}/@{arch}" 6-7 gitlab-ci-multi-runner x86_64 "el@{os_ver}" "$YUM_PATH" echo "YUM finished" -"$apt_sync" "${UPSTREAM}/ubuntu" @ubuntu-lts main amd64,i386 "$UBUNTU_PATH" +"$apt_sync" --delete-dry-run "${UPSTREAM}/ubuntu" @ubuntu-lts main amd64,i386 "$UBUNTU_PATH" echo "Ubuntu finished" -"$apt_sync" "${UPSTREAM}/debian" @debian-current main amd64,i386 "$DEBIAN_PATH" +"$apt_sync" --delete-dry-run "${UPSTREAM}/debian" @debian-current main amd64,i386 "$DEBIAN_PATH" echo "Debian finished" diff --git a/gitlab-runner.sh b/gitlab-runner.sh index c092e41..b8f6cb0 100755 --- a/gitlab-runner.sh +++ b/gitlab-runner.sh @@ -17,9 +17,9 @@ DEBIAN_PATH="${BASE_PATH}/debian/" "$yum_sync" "${UPSTREAM}/el/@{os_ver}/@{arch}" 6-8 gitlab-runner x86_64 "el@{os_ver}" "$YUM_PATH" echo "YUM finished" -"$apt_sync" "${UPSTREAM}/ubuntu" @ubuntu-lts main amd64,i386 "$UBUNTU_PATH" +"$apt_sync" --delete-dry-run "${UPSTREAM}/ubuntu" @ubuntu-lts main amd64,i386 "$UBUNTU_PATH" echo "Ubuntu finished" -"$apt_sync" "${UPSTREAM}/debian" @debian-current main amd64,i386 "$DEBIAN_PATH" +"$apt_sync" --delete-dry-run "${UPSTREAM}/debian" @debian-current main amd64,i386 "$DEBIAN_PATH" echo "Debian finished" # vim: ts=4 sts=4 sw=4 diff --git a/grafana.sh b/grafana.sh index 4c5e07a..cf4b32c 100755 --- a/grafana.sh +++ b/grafana.sh @@ -14,7 +14,7 @@ YUM_PATH="${BASE_PATH}/yum" APT_PATH="${BASE_PATH}/apt" # =================== APT repos =============================== -"$apt_sync" "${BASE_URL}/deb" stable,beta main amd64,armhf,arm64 "$APT_PATH" +"$apt_sync" --delete-dry-run "${BASE_URL}/deb" stable,beta main amd64,armhf,arm64 "$APT_PATH" echo "APT finished" diff --git a/influxdata.sh b/influxdata.sh index 0d66562..c724056 100755 --- a/influxdata.sh +++ b/influxdata.sh @@ -18,9 +18,9 @@ wget -O ${BASE_PATH}/influxdb.key ${BASE_URL}/influxdb.key # =================== APT repos =============================== -"$apt_sync" "${BASE_URL}/ubuntu" @ubuntu-lts stable amd64,i386,armhf,arm64 "$UBUNTU_PATH" +"$apt_sync" --delete-dry-run "${BASE_URL}/ubuntu" @ubuntu-lts stable amd64,i386,armhf,arm64 "$UBUNTU_PATH" echo "Ubuntu finished" -"$apt_sync" "${BASE_URL}/debian" @debian-current stable amd64,i386,armhf,arm64 "$DEBIAN_PATH" +"$apt_sync" --delete-dry-run "${BASE_URL}/debian" @debian-current stable amd64,i386,armhf,arm64 "$DEBIAN_PATH" echo "Debian finished" diff --git a/kubernetes.sh b/kubernetes.sh index 8d6c1e9..7382a9c 100755 --- a/kubernetes.sh +++ b/kubernetes.sh @@ -14,7 +14,7 @@ YUM_PATH="${BASE_PATH}/yum/repos" APT_PATH="${BASE_PATH}/apt" # =================== APT repos =============================== -"$apt_sync" "${BASE_URL}/apt" "kubernetes-@{debian-current},kubernetes-@{ubuntu-lts}" main amd64,i386,armhf,arm64 "$APT_PATH" +"$apt_sync" --delete-dry-run "${BASE_URL}/apt" "kubernetes-@{debian-current},kubernetes-@{ubuntu-lts}" main amd64,i386,armhf,arm64 "$APT_PATH" echo "APT finished" # =================== YUM/DNF repos ========================== diff --git a/proxmox.sh b/proxmox.sh index 9370ee0..fab0176 100755 --- a/proxmox.sh +++ b/proxmox.sh @@ -13,7 +13,7 @@ APT_PATH="${BASE_PATH}/debian" # === download deb packages ==== -"$apt_sync" "${BASE_URL}/debian" @debian-current pve-no-subscription,pvetest amd64 "$APT_PATH" +"$apt_sync" --delete-dry-run "${BASE_URL}/debian" @debian-current pve-no-subscription,pvetest amd64 "$APT_PATH" echo "Debian finished" # === download standalone files ==== diff --git a/ros2.sh b/ros2.sh index 8810915..be3231c 100755 --- a/ros2.sh +++ b/ros2.sh @@ -13,5 +13,5 @@ APT_PATH="${BASE_PATH}/ubuntu" APT_VERSIONS=@ubuntu-lts,disco,eoan,focal,@debian-current # =================== APT repos =============================== -"$apt_sync" "${BASE_URL}/ubuntu" $APT_VERSIONS main amd64,armhf,arm64 "$APT_PATH" +"$apt_sync" --delete-dry-run "${BASE_URL}/ubuntu" $APT_VERSIONS main amd64,armhf,arm64 "$APT_PATH" echo "APT finished" diff --git a/rudder.sh b/rudder.sh index 19745d6..37fd214 100755 --- a/rudder.sh +++ b/rudder.sh @@ -19,7 +19,7 @@ components=${components:1} echo "YUM finished" for ver in ${RUDDER_VERS[@]}; do - "$apt_sync" "${UPSTREAM}/apt/${ver}" @ubuntu-lts,@debian-current main amd64 "$APT_PATH/${ver}" + "$apt_sync" --delete-dry-run "${UPSTREAM}/apt/${ver}" @ubuntu-lts,@debian-current main amd64 "$APT_PATH/${ver}" done echo "APT finished" diff --git a/virtualbox.sh b/virtualbox.sh index f036c1b..9b2177e 100755 --- a/virtualbox.sh +++ b/virtualbox.sh @@ -23,7 +23,7 @@ echo "YUM finished" # === download deb packages ==== -"$apt_sync" "${BASE_URL}/debian" @debian-current,@ubuntu-lts contrib,non-free amd64,i386 "$APT_PATH" +"$apt_sync" --delete-dry-run "${BASE_URL}/debian" @debian-current,@ubuntu-lts contrib,non-free amd64,i386 "$APT_PATH" echo "Debian and ubuntu finished" # === download standalone packages ====