affine/jobserv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better client help output

Browse source
This commit is contained in:
Aidan Hahn 2019-05-31 13:51:50 -07:00
parent fcfde27941
commit cd8df94df0
No known key found for this signature in database
GPG key ID: 327711E983899316
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
buildwrapper.sh
View file

@ -91,8 +91,10 @@ mkdir staging/server
mkdir staging/test mkdir staging/test
DIST_TAR=JobServ.tar DIST_TAR=JobServ.tar
DIST_DIR=JobServ
if [ -e build/distributions/jobserv.tar]; then if [ -e build/distributions/jobserv.tar]; then
DIST_TAR=jobserv.tar DIST_TAR=jobserv.tar
DIST_DIR=jobserv
fi fi
tar -xvf build/distributions/$DIST_TAR -C staging/client 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 tar -xvf build/distributions/$DIST_TAR -C staging/test
echo "[+] removing server capabilities from client" 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" 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" echo "[+] populating certificates"
cp resources/server/server.crt staging/server/ cp resources/server/server.crt staging/server/
@ -117,14 +119,14 @@ cp -r resources/* staging/test/
echo "[+] Adding wrapper script for client" echo "[+] Adding wrapper script for client"
# This could also be a .desktop file without much more work. # This could also be a .desktop file without much more work.
cat << EOF > staging/client/client 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 EOF
chmod +x staging/client/client chmod +x staging/client/client
echo "[+] Adding wrapper script for server" echo "[+] Adding wrapper script for server"
# This could also be a .desktop file without much more work. # This could also be a .desktop file without much more work.
cat << EOF > staging/server/server 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 EOF
chmod +x staging/server/server chmod +x staging/server/server

4
src/main/java/JobServ/JobServClient.java
View file

@ -236,8 +236,8 @@ public class JobServClient {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
// check args // check args
if (args.length < 7) { if (args.length < 7) {
System.out.println("Usage: $ ./jobserv-client privatekey, cert, truststore, host, port, command, args"); System.out.println("Usage: $ ./client host, port, command, args");
System.out.println("Or try $ ./jobserv-client help"); System.out.println("Or try $ ./client help");
outputHelp(); outputHelp();
return; return;
} }