From 89a4f30eab6bd9e0c3f8a716dadf4f64f26e00a3 Mon Sep 17 00:00:00 2001 From: Oleg Gaidarenko Date: Fri, 2 Aug 2019 14:22:50 +0300 Subject: [PATCH] Build: allow bash to expand the wildcard (#18354) If wildcards are in the quotes they not going to be expanded --- scripts/build/update_repo/update-deb.sh | 2 +- scripts/build/update_repo/update-rpm.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build/update_repo/update-deb.sh b/scripts/build/update_repo/update-deb.sh index f7fe0c349d2..a51648c096c 100755 --- a/scripts/build/update_repo/update-deb.sh +++ b/scripts/build/update_repo/update-deb.sh @@ -36,7 +36,7 @@ mkdir -p /deb-repo/db \ gsutil -m rsync -r -d "gs://$GCP_DB_BUCKET/$RELEASE_TYPE" /deb-repo/db # Add the new release to the repo -cp "$DIST_PATH/*.deb" /deb-repo/tmp +cp "$DIST_PATH"/*.deb /deb-repo/tmp rm /deb-repo/tmp/grafana_latest*.deb || true aptly repo add "$REPO" /deb-repo/tmp #adds too many packages in enterprise diff --git a/scripts/build/update_repo/update-rpm.sh b/scripts/build/update_repo/update-rpm.sh index 028773d5069..304a2487b54 100755 --- a/scripts/build/update_repo/update-rpm.sh +++ b/scripts/build/update_repo/update-rpm.sh @@ -33,7 +33,7 @@ mkdir -p /rpm-repo gsutil -m rsync -r "$BUCKET" /rpm-repo # Add the new release to the repo -cp "$DIST_PATH/*.rpm" /rpm-repo # adds to many files for enterprise +cp "$DIST_PATH"/*.rpm /rpm-repo # adds to many files for enterprise rm /rpm-repo/grafana-latest-1*.rpm || true createrepo /rpm-repo