Use shell string processing instead of sed in ssl-opt.sh

This commit is contained in:
Hanno Becker 2017-10-23 15:27:37 +01:00
parent e41158ba10
commit 4ac73e7804

View file

@ -457,7 +457,7 @@ run_test() {
kill $PXY_PID >/dev/null 2>&1 kill $PXY_PID >/dev/null 2>&1
sleep 0.01 sleep 0.01
if kill -0 $PXY_PID >/dev/null 2>&1; then if kill -0 $PXY_PID >/dev/null 2>&1; then
kill -KILL $pXY_PID kill -KILL $PXY_PID
wait $PXY_PID wait $PXY_PID
fi fi
fi fi
@ -608,12 +608,9 @@ fi
get_options "$@" get_options "$@"
# sanity checks, avoid an avalanche of errors # sanity checks, avoid an avalanche of errors
P_SRV_BIN=$(echo "$P_SRV" | sed -r -n "s/^([^ ]*).*$/\1/p") P_SRV_BIN="${P_SRV%%[ ]*}"
echo "Server binary: ${P_SRV_BIN}" P_CLI_BIN="${P_CLI%%[ ]*}"
P_CLI_BIN=$(echo "$P_CLI" | sed -r -n "s/^([^ ]*).*$/\1/p") P_PXY_BIN="${P_PXY%%[ ]*}"
echo "Client binary: ${P_CLI_BIN}"
P_PXY_BIN=$(echo "$P_PXY" | sed -r -n "s/^([^ ]*).*$/\1/p")
echo "Proxy binary: ${P_PXY_BIN}"
if [ ! -x "$P_SRV_BIN" ]; then if [ ! -x "$P_SRV_BIN" ]; then
echo "Command '$P_SRV_BIN' is not an executable file" echo "Command '$P_SRV_BIN' is not an executable file"
exit 1 exit 1