From 09c69f836e51c98e51ba00e9d9eb36a4a34d03bf Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Wed, 14 Jun 2023 12:14:08 -0400
Subject: [PATCH] Fix SSH key location

---
 eclipse-distribution/pom.xml             | 2 +-
 eclipse-distribution/scripts/sign-exe.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index da69140fb..dd5c39e54 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -97,7 +97,7 @@
 		<misc.p2.repo.version>3.9.4.202211021051</misc.p2.repo.version>
 
 		<vm-signing.ssh.user>signer</vm-signing.ssh.user>
-		<vm-signing.ssh.key>/home/bamboo/.ssh/id_rsa</vm-signing.ssh.key>
+		<vm-signing.ssh.key>~bamboo/.ssh/id_rsa</vm-signing.ssh.key>
 	</properties>
 
 	<profiles>
diff --git a/eclipse-distribution/scripts/sign-exe.sh b/eclipse-distribution/scripts/sign-exe.sh
index 3edbc27b7..236216549 100755
--- a/eclipse-distribution/scripts/sign-exe.sh
+++ b/eclipse-distribution/scripts/sign-exe.sh
@@ -2,9 +2,9 @@ set -e
 in_file=$1
 out_file=$2
 
-in_filename=`basename $in_file`
-echo "Input file: $in_file"
+in_filename="$(basename -- $in_file)"
 echo "Copying $in_filename to remote machine..."
+echo "Input file: $in_file"
 scp -i $SSH_KEY $in_file $SSH_USER@vm-tools.spring.vmware.com:/opt/bamboo
 echo "Signing $in_filename..."
 ssh -i $SSH_KEY $SSH_USER@vm-tools.spring.vmware.com -- /build/apps/signing/signserver/signc -v --input=/opt/bamboo/$in_filename --keyid=authenticode_SHA2 --signmethod="winddk-8.1" --output=/opt/bamboo/$in_filename --hash sha256