From cd8df94df0a0d2e8c1ed8a4f212b7c9c9eab700f Mon Sep 17 00:00:00 2001
From: Aidan Hahn <aidan@aidanis.online>
Date: Fri, 31 May 2019 13:51:50 -0700
Subject: [PATCH] better client help output

---
 buildwrapper.sh                          | 10 ++++++----
 src/main/java/JobServ/JobServClient.java |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/buildwrapper.sh b/buildwrapper.sh
index 719e1d1..5e1d418 100755
--- a/buildwrapper.sh
+++ b/buildwrapper.sh
@@ -91,8 +91,10 @@ mkdir staging/server
 mkdir staging/test
 
 DIST_TAR=JobServ.tar
+DIST_DIR=JobServ
 if [ -e build/distributions/jobserv.tar]; then
     DIST_TAR=jobserv.tar
+    DIST_DIR=jobserv
 fi
 
 tar -xvf build/distributions/$DIST_TAR -C staging/client
@@ -100,10 +102,10 @@ tar -xvf build/distributions/$DIST_TAR -C staging/server
 tar -xvf build/distributions/$DIST_TAR -C staging/test
 
 echo "[+] removing server capabilities from client"
-rm staging/client/JobServ/bin/jobserv-server staging/client/JobServ/bin/jobserv-server.bat
+rm staging/client/$DIST_DIR/bin/jobserv-server staging/client/$DIST_DIR/bin/jobserv-server.bat
 
 echo "[+] removing client capabilities from server"
-rm staging/server/JobServ/bin/jobserv-client staging/server/JobServ/bin/jobserv-client.bat
+rm staging/server/$DIST_DIR/bin/jobserv-client staging/server/$DIST_DIR/bin/jobserv-client.bat
 
 echo "[+] populating certificates"
 cp resources/server/server.crt staging/server/
@@ -117,14 +119,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
-    ./JobServ/bin/jobserv-client private.pem client.crt ca.crt \$@
+    ./$DIST_DIR/bin/jobserv-client private.pem client.crt ca.crt \$@
 EOF
 chmod +x staging/client/client
 
 echo "[+] Adding wrapper script for server"
 # This could also be a .desktop file without much more work.
 cat << EOF > staging/server/server
-    ./JobServ/bin/jobserv-server \$1 server.crt private.pem ca.crt
+    ./$DIST_DIR/bin/jobserv-server \$1 server.crt private.pem ca.crt
 EOF
 chmod +x staging/server/server
 
diff --git a/src/main/java/JobServ/JobServClient.java b/src/main/java/JobServ/JobServClient.java
index 3c66e53..9291055 100644
--- a/src/main/java/JobServ/JobServClient.java
+++ b/src/main/java/JobServ/JobServClient.java
@@ -236,8 +236,8 @@ public class JobServClient {
     public static void main(String[] args) throws Exception {
         // check args
         if (args.length < 7) {
-            System.out.println("Usage: $ ./jobserv-client privatekey, cert, truststore, host, port, command, args");
-            System.out.println("Or try $ ./jobserv-client help");
+            System.out.println("Usage: $ ./client host, port, command, args");
+            System.out.println("Or try $ ./client help");
             outputHelp();
             return;
         }