From 3538cac0d8e2c9ebed543ef700f015d0b87e2ea1 Mon Sep 17 00:00:00 2001
From: Aidan Hahn <aidan@aidanis.online>
Date: Thu, 23 May 2019 17:07:43 -0700
Subject: [PATCH] distribution instructions in readme, easy run scripts in
 staging folders

---
 README.md       | 11 +++++++----
 buildwrapper.sh | 12 ++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 8b909f2..355f4b3 100644
--- a/README.md
+++ b/README.md
@@ -21,16 +21,19 @@ After build, the programs can be found in the staging folder.
 After changing directory to the 'staging/client' folder or the 'staging/server' folder, either program can be run as follows:
 
 ```
-$ ./server.sh (port)
-$ ./client.sh (hostname) (port) (command) (arguments)
+$ ./server (port)
+$ ./client (hostname) (port) (command) (arguments)
 ```
 alternatively, for guidance: 
 
 ```
-$ ./JobServ/bin/jobserv-server 
-$ ./JobServ/bin/jobserv-client help
+$ ./server 
+$ ./client help
 ```
 
+# Distribution
+At this point you can copy the staging/client or staging/server folders to any environment in which their Certificate CN's are valid.
+
 # Testing
 Running the gradle test task, or the buildwrapper will run all junit tests.
 Currently that includes a test of certificate based authentication (Mutual TLS) and unit tests for the thread safe process control module
diff --git a/buildwrapper.sh b/buildwrapper.sh
index d59dd6a..2e9712c 100755
--- a/buildwrapper.sh
+++ b/buildwrapper.sh
@@ -109,14 +109,14 @@ cp -r resources/* staging/test/
 
 echo "[+] Adding wrapper script for client"
 # This could also be a .desktop file without much more work.
-cat << EOF > staging/client/client.sh
-    ./JobServ/bin/jobserv-client "${@:4}"
+cat << EOF > staging/client/client
+    ./JobServ/bin/jobserv-client private.pem client.crt ca.crt \$@
 EOF
-chown +x staging/client/client.sh
+chmod +x staging/client/client.sh
 
 echo "[+] Adding wrapper script for server"
 # This could also be a .desktop file without much more work.
-cat << EOF > staging/server/server.sh
-    ./JobServ/bin/jobserv-server "$1"
+cat << EOF > staging/server/server
+    ./JobServ/bin/jobserv-server \$1 server.crt private.pem ca.crt
 EOF
-chown +x staging/server/server.sh
+chmod +x staging/server/server.sh