From 8f3fc3014d45be89193768b2c442a9a12a044ab5 Mon Sep 17 00:00:00 2001 From: Jeff Alyanak Date: Thu, 26 Dec 2019 21:02:41 -0500 Subject: [PATCH 1/2] Fixed default key directory Script was not looking in the right place for the auto-generated key directory. This patch fixes issue #35. --- src/licenseGen/run.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/licenseGen/run.sh b/src/licenseGen/run.sh index ebfdd58..549bd15 100755 --- a/src/licenseGen/run.sh +++ b/src/licenseGen/run.sh @@ -4,7 +4,7 @@ DIR=`dirname "$0"` DIR=`exec 2>/dev/null;(cd -- "$DIR") && cd -- "$DIR"|| cd "$DIR"; unset PWD; /usr/bin/pwd || /bin/pwd || pwd` # Grab the absolute path to the default pfx location -cert_path="$DIR/.keys/cert.pfx" +cert_path="$DIR/../../.keys/cert.pfx" if [ "$#" -lt "1" ]; then echo "USAGE: $0 [License Gen args...]" @@ -15,5 +15,7 @@ elif [ "$#" -ge "2" ]; then shift fi +echo "$cert_path" + docker run -it --rm -v "$cert_path:/cert.pfx" bitbetter/licensegen "$@" From dc6546aeb59400bec33eaf0587441c6fb1badfc9 Mon Sep 17 00:00:00 2001 From: Jeff Alyanak Date: Thu, 26 Dec 2019 21:07:52 -0500 Subject: [PATCH 2/2] Cleans up Key Directory Patch Key directory path fix was echoing the directory when run. --- src/licenseGen/run.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/licenseGen/run.sh b/src/licenseGen/run.sh index 549bd15..6ea9662 100755 --- a/src/licenseGen/run.sh +++ b/src/licenseGen/run.sh @@ -15,7 +15,5 @@ elif [ "$#" -ge "2" ]; then shift fi -echo "$cert_path" - docker run -it --rm -v "$cert_path:/cert.pfx" bitbetter/licensegen "$@"