From 8d71437b8d41623fdd485b7d0f659b55860648b5 Mon Sep 17 00:00:00 2001
From: Chris Marget <5470536+chrismarget@users.noreply.github.com>
Date: Wed, 8 Apr 2020 15:31:28 -0400
Subject: T2239: fix issue with ovftool signing command

Signing key can be submitted by putting key at a fixed location
(key/privatekey.pem) or by putting the key location in environment
variable PRIVATE_KEY_PATH. The script checks for either of those
possibilities.

ovftool command was incorrectly using the PRIVATE_KEY_PATH variable
even when the key file was dropped in the prescribed location.
---
 scripts/build-vmware-image | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/build-vmware-image b/scripts/build-vmware-image
index 665d0f58..e56ce137 100755
--- a/scripts/build-vmware-image
+++ b/scripts/build-vmware-image
@@ -201,10 +201,10 @@ if [ ! -f ${private_key} ]; then
   echo 'Please put your key to "key/privatekey.pem" in repository root, or set PRIVATE_KEY_PATH to environment variables.'
   exit 1
 fi
-ovftool --privateKey=${PRIVATE_KEY_PATH} vyos_vmware_image.ovf vyos_vmware_image-signed.ova
+ovftool --privateKey=${private_key} vyos_vmware_image.ovf vyos_vmware_image-signed.ova
 #ovftool vyos_vmware_image.ovf vyos_vmware_image-signed.ova
 
 # Convert the OVF to signed OVF...
 echo 'Converting the OVF to signed OVF...'
-ovftool --privateKey=${PRIVATE_KEY_PATH} vyos_vmware_image.ovf vyos_vmware_image-signed.ovf
+ovftool --privateKey=${private_key} vyos_vmware_image.ovf vyos_vmware_image-signed.ovf
 #ovftool vyos_vmware_image.ovf vyos_vmware_image-signed.ovf
-- 
cgit v1.2.3