From 62ad58ad56e51b5b454f0f048a3eb171d70b17d0 Mon Sep 17 00:00:00 2001
From: Oliver Smith <osmith@sysmocom.de>
Date: Mon, 8 Mar 2021 08:33:47 +0100
Subject: [PATCH] contrib/prepare_upload.sh: fix cd problems

Call the script from the proper directory, and cd into the topdir on top
of the script. Fixes:
/build/contrib/jenkins.sh: line 71: contrib/prepare_upload.sh: No such file or directory

Related: OS#4413
Change-Id: Icbfaa5579aab887830ca90b24a2e322df8d98f4f
---
 contrib/jenkins.sh        | 2 +-
 contrib/prepare_upload.sh | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 2ad7a7f7..8268bcf8 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -68,7 +68,7 @@ rm -rf $TOPDIR/firmware/bin/simtrace-cardem*
 if [ "x$publish" = "x--publish" ]; then
 	echo
 	echo "=============== UPLOAD BUILD  =============="
-	contrib/prepare_upload.sh
+	$TOPDIR/contrib/prepare_upload.sh
 
 	cat > "/build/known_hosts" <<EOF
 [rita.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9
diff --git a/contrib/prepare_upload.sh b/contrib/prepare_upload.sh
index 8242fd44..90b32787 100755
--- a/contrib/prepare_upload.sh
+++ b/contrib/prepare_upload.sh
@@ -1,5 +1,7 @@
 #!/bin/sh -e
 # Create copies of binaries with -latest, -$GIT_VERSION (OS#4413, OS#3452)
+cd "$(dirname "$0")/.."
+
 GIT_VERSION="$(./git-version-gen .tarball-version)"
 
 echo "Copying binaries with "-latest" and "-$GIT_VERSION" appended..."