diff --git a/README.md b/README.md index 680a1e8..8b909f2 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ 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: ``` -$ ./JobServ/bin/jobserv-server (port) server.crt private.pem ca.crt -$ ./JobServ/bin/jobserv-client private.pem client.crt ca.crt (hostname) (port) (command) (arguments) +$ ./server.sh (port) +$ ./client.sh (hostname) (port) (command) (arguments) ``` alternatively, for guidance: @@ -33,5 +33,4 @@ $ ./JobServ/bin/jobserv-client help # 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) -(TODO: job control module 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 9d6a19f..d59dd6a 100755 --- a/buildwrapper.sh +++ b/buildwrapper.sh @@ -106,3 +106,17 @@ cp resources/client/client.crt staging/client/ cp resources/client/private.pem staging/client/ cp resources/server/ca.crt staging/client/ 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}" +EOF +chown +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" +EOF +chown +x staging/server/server.sh