From cbf2f1e050b1966944a913a29ac02e518ac539b8 Mon Sep 17 00:00:00 2001
From: z4yx <z4yx@users.noreply.github.com>
Date: Thu, 30 Apr 2020 09:39:50 +0800
Subject: [PATCH] simplify scripts

---
 ELK.sh            | 2 +-
 chef.sh           | 2 +-
 elastic.sh        | 2 +-
 erlang.sh         | 2 +-
 gitlab-ce.sh      | 2 +-
 gitlab-runner.sh  | 2 +-
 grafana.sh        | 2 +-
 influxdata.sh     | 2 +-
 kubernetes.sh     | 2 +-
 mongodb.sh        | 2 +-
 openmediavault.sh | 2 +-
 ros2.sh           | 2 +-
 rudder.sh         | 2 +-
 termux.sh         | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ELK.sh b/ELK.sh
index 7ac0ff4..a106818 100755
--- a/ELK.sh
+++ b/ELK.sh
@@ -41,4 +41,4 @@ for repo in "${!REPO_VERSIONS[@]}"; do
 	"$yum_sync" "${BASE_URL}/${repo}/@{comp}/centos/" 7 "$components" x86_64 "${repo}-@{comp}" "$YUM_PATH"
 done
 
-"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE; rm $REPO_SIZE_FILE
\ No newline at end of file
+"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE --rm
\ No newline at end of file
diff --git a/chef.sh b/chef.sh
index d06980f..f9b58d2 100755
--- a/chef.sh
+++ b/chef.sh
@@ -19,6 +19,6 @@ echo "YUM finished"
 "$apt_sync" --delete-dry-run "${UPSTREAM}/apt/stable" @ubuntu-lts,@debian-current main amd64,i386,aarch64 "$APT_PATH"
 echo "APT finished"
 
-"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE; rm $REPO_SIZE_FILE
+"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE --rm
 
 # vim: ts=4 sts=4 sw=4
diff --git a/elastic.sh b/elastic.sh
index ecf5667..9a70398 100755
--- a/elastic.sh
+++ b/elastic.sh
@@ -34,4 +34,4 @@ for elsver in ${ELASTIC_VERSION[@]}; do
 	(cd ${BASE_PATH}/${elsver}; ln -sfn ../yum/elastic-${elsver} yum)
 done
 
-"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE; rm $REPO_SIZE_FILE
+"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE --rm
diff --git a/erlang.sh b/erlang.sh
index 4161c4e..f249d9d 100755
--- a/erlang.sh
+++ b/erlang.sh
@@ -24,4 +24,4 @@ echo "Debian finished"
 "$yum_sync" "${BASE_URL}/rpm/centos/@{os_ver}/@{arch}" 6-8 erlang x86_64 "@{os_ver}" "$YUM_PATH"
 echo "YUM finished"
 
-"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE; rm $REPO_SIZE_FILE
+"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE --rm
diff --git a/gitlab-ce.sh b/gitlab-ce.sh
index cd2dc95..eb1c44b 100755
--- a/gitlab-ce.sh
+++ b/gitlab-ce.sh
@@ -23,6 +23,6 @@ echo "Ubuntu finished"
 "$apt_sync" --delete-dry-run "${UPSTREAM}/debian" @debian-current main amd64,i386 "$DEBIAN_PATH"
 echo "Debian finished"
 
-"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE; rm $REPO_SIZE_FILE
+"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE --rm
 
 # vim: ts=4 sts=4 sw=4
diff --git a/gitlab-runner.sh b/gitlab-runner.sh
index 262e040..1e2192f 100755
--- a/gitlab-runner.sh
+++ b/gitlab-runner.sh
@@ -23,6 +23,6 @@ echo "Ubuntu finished"
 "$apt_sync" --delete "${UPSTREAM}/debian" @debian-current main amd64,i386,arm64 "$DEBIAN_PATH"
 echo "Debian finished"
 
-"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE; rm $REPO_SIZE_FILE
+"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE --rm
 
 # vim: ts=4 sts=4 sw=4
diff --git a/grafana.sh b/grafana.sh
index 53031c2..4021ff4 100755
--- a/grafana.sh
+++ b/grafana.sh
@@ -23,4 +23,4 @@ echo "APT finished"
 "$yum_sync" "${BASE_URL}/@{comp}" 7 rpm,rpm-beta x86_64 "@{comp}" "$YUM_PATH"
 echo "YUM finished"
 
-"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE; rm $REPO_SIZE_FILE
+"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE --rm
diff --git a/influxdata.sh b/influxdata.sh
index 0d04047..d75d4d1 100755
--- a/influxdata.sh
+++ b/influxdata.sh
@@ -29,4 +29,4 @@ echo "Debian finished"
 "$yum_sync" "${BASE_URL}/rhel/@{os_ver}/@{arch}/stable/" 6-8 influxdata x86_64 "el@{os_ver}-@{arch}" "$YUM_PATH"
 echo "YUM finished"
 
-"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE; rm $REPO_SIZE_FILE
+"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE --rm
diff --git a/kubernetes.sh b/kubernetes.sh
index ef22aa5..59a8c7d 100755
--- a/kubernetes.sh
+++ b/kubernetes.sh
@@ -23,4 +23,4 @@ echo "APT finished"
 "$yum_sync" "${BASE_URL}/yum/repos/@{comp}-el@{os_ver}-@{arch}/" 7 kubernetes x86_64,armhfp,aarch64 "@{comp}-el@{os_ver}-@{arch}" "$YUM_PATH"
 echo "YUM finished"
 
-"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE; rm $REPO_SIZE_FILE
+"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE --rm
diff --git a/mongodb.sh b/mongodb.sh
index 7ed9088..46f99e6 100755
--- a/mongodb.sh
+++ b/mongodb.sh
@@ -43,6 +43,6 @@ for dist in "$BASE_URL"/apt/*/dists/*/mongodb-org/; do
 done
 echo "APT finished"
 
-"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE; rm $REPO_SIZE_FILE
+"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE --rm
 
 # vim: ts=4 sts=4 sw=4
diff --git a/openmediavault.sh b/openmediavault.sh
index 075d19c..4751a64 100755
--- a/openmediavault.sh
+++ b/openmediavault.sh
@@ -16,4 +16,4 @@ export REPO_SIZE_FILE=/tmp/reposize.$RANDOM
 "$apt_sync" --delete "${BASE_URL}" "$DISTS" main,partner amd64,i386,arm64,armel,armhf "$APT_PATH"
 echo "APT finished"
 
-"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE; rm $REPO_SIZE_FILE
+"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE --rm
diff --git a/ros2.sh b/ros2.sh
index 6089df2..7b8c056 100755
--- a/ros2.sh
+++ b/ros2.sh
@@ -16,4 +16,4 @@ export REPO_SIZE_FILE=/tmp/reposize.$RANDOM
 "$apt_sync" --delete "${BASE_URL}/ubuntu" @ubuntu-lts,@debian-current main amd64,armhf,arm64 "$APT_PATH"
 echo "APT finished"
 
-"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE; rm $REPO_SIZE_FILE
+"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE --rm
diff --git a/rudder.sh b/rudder.sh
index f2ece0e..3d0a9f6 100755
--- a/rudder.sh
+++ b/rudder.sh
@@ -24,6 +24,6 @@ for ver in ${RUDDER_VERS[@]}; do
 done
 echo "APT finished"
 
-"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE; rm $REPO_SIZE_FILE
+"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE --rm
 
 # vim: ts=4 sts=4 sw=4
diff --git a/termux.sh b/termux.sh
index 9aa5cbc..852f463 100755
--- a/termux.sh
+++ b/termux.sh
@@ -18,4 +18,4 @@ ARCH_LIST="aarch64,arm,i686,x86_64"
 
 echo "finished"
 
-"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE; rm $REPO_SIZE_FILE
+"${_here}/helpers/size-sum.sh" $REPO_SIZE_FILE --rm