From a954b51223a1b3e8f8e45b524dde1792d960051b Mon Sep 17 00:00:00 2001 From: buanet Date: Sun, 16 Apr 2023 00:54:15 +0200 Subject: [PATCH] small fixes --- debian/scripts/setup_packages.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/debian/scripts/setup_packages.sh b/debian/scripts/setup_packages.sh index 5ad055a..2b9d848 100644 --- a/debian/scripts/setup_packages.sh +++ b/debian/scripts/setup_packages.sh @@ -15,8 +15,7 @@ check_package_preq() { # check for influx packages if [[ "$i" == "influxdb" || "$i" == "influxdb2-cli" ]]; then # add influxdata repo - wget -q https://repos.influxdata.com/influxdata-archive_compat.key - cat influxdata-archive_compat.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg > /dev/null + wget -qO- https://repos.influxdata.com/influxdata-archive_compat.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg > /dev/null echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list fi } @@ -25,7 +24,7 @@ check_package_validity() { if [[ echo "$packages" | grep -qw "influxdb" && echo "$packages" | grep -qw "influxdb2-cli" ]]; then echo "PACKAGES includes \"influxdb\" AND \"influxdb2-cli\"." echo "As installing both packages together is not possible, they will be skipped." - packages=$(echo "$packages" | sed 's/influxdb//g' | sed 's/influxdb2-cli//g') + packages=$(echo "$packages" | sed 's/influxdb//g;s/influxdb2-cli//g') if [[ "$debug" == "true" ]]; then echo "[DEBUG] New list of packages: = ""$packages"; fi echo ' ' fi @@ -61,7 +60,7 @@ if [[ "$1" == "-install" ]]; then fi fi else - echo "$i is already installed." + echo "$i is already installed." fi done elif [[ "$1" == "-update" ]]; then @@ -87,4 +86,4 @@ fi apt-get -qq autoclean -y && apt-get -qq autoremove && apt-get -qq clean rm -rf /tmp/* /var/tmp/* && rm -rf /root/.cache/* && rm -rf /var/lib/apt/lists/* && rm -f /opt/scripts/.docker_config/.packages -exit 0 +exit 0 \ No newline at end of file