From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 2 Apr 2020 20:36:04 +0000 (-0400)
Subject: jjb: lttng-modules: fix '//' in s3 url
X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;h=874459315d698e935aee36b12cb5aa5cffcdb2a9;p=lttng-ci.git

jjb: lttng-modules: fix '//' in s3 url
---

diff --git a/scripts/lttng-modules/param-build.sh b/scripts/lttng-modules/param-build.sh
index 45fde20..f414ca9 100644
--- a/scripts/lttng-modules/param-build.sh
+++ b/scripts/lttng-modules/param-build.sh
@@ -604,7 +604,13 @@ signature_v2 = False" > "$WORKSPACE/.s3cfg"
 
 url_hash="$(echo -n "$kgitrepo" | md5sum | awk '{ print $1 }')"
 obj_name="linux.tar.bz2"
-obj_url_prefix="$OBJ_STORE_URL/linux-build/$url_hash/$ktag/$arch/${cross_arch:-native}"
+
+if [ "x${cross_arch}" = "x" ]; then
+	obj_url_prefix="$OBJ_STORE_URL/linux-build/$url_hash/$ktag/$arch/native"
+else
+	obj_url_prefix="$OBJ_STORE_URL/linux-build/$url_hash/$ktag/${cross_arch}"
+fi
+
 obj_url="$obj_url_prefix/$obj_name"
 
 set +e