diff options
author | Ben Alex | 2021-01-16 11:51:29 +1100 |
---|---|---|
committer | Ben Alex | 2021-01-16 11:51:29 +1100 |
commit | 1d98b41c3cc4910f81050a6e303f14b785f35cbd (patch) | |
tree | 8150b72b52641c9abf0162ddb03ec37198b2fc6e | |
parent | 83dcb2bebacd64cbf87cb28b64841048931396d9 (diff) | |
download | aur-1d98b41c3cc4910f81050a6e303f14b785f35cbd.tar.gz |
tws_get_version to now use official tws launch script
-rwxr-xr-x | tws_get_version | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/tws_get_version b/tws_get_version index fc094fd77967..2530ef740c81 100755 --- a/tws_get_version +++ b/tws_get_version @@ -12,29 +12,22 @@ if ! test -e "$1"; then exit 1 fi -ARG1="$(readlink -v -f "$1")" || exit 1 - -TDIR="$(mktemp -d -t twsdir.XXXX)" || exit 1 -trap "rm -rf ${TDIR}" exit -cd "${TDIR}" || exit 1 - # Clean up installation directories if required and install new version -rm -rf $HOME/.install4j $HOME/.i4j_jres $HOME/tws +rm -rf $HOME/Jts $HOME/.install4j $HOME/.i4j_jres $HOME/tws +mkdir -p $HOME/Jts + +# Install TWS +ARG1="$(readlink -v -f "$1")" || exit 1 chmod +x ${ARG1} ${ARG1} -q &> /dev/null -TWS_HOME="${TDIR}/twshome" -mkdir "${TWS_HOME}" || exit 1 -LOG="${TWS_HOME}/launcher.log" - -TWS_CP=`find ${HOME}/tws/jars -type f -name \*.jar -printf '%p:'` -/usr/sbin/xvfb-run -n 99 /usr/lib/jvm/java-8-openjdk/jre/bin/java -cp "${TWS_CP}" jclient.LoginFrame "${TWS_HOME}" & -disown -TWS_PID="$!" +# Run TWS in virtual frame buffer +LOG="$HOME/Jts/launcher.log" +/usr/sbin/xvfb-run -n 99 $HOME/tws/tws & # Wait for TWS JVM to start writing to $LOG while [ ! -f $LOG ]; do - inotifywait -q -q -t 10 -e create --format '%f' $TWS_HOME + inotifywait -q -q -t 10 -e create --format '%f' $HOME/Jts if [ $? -eq 2 ] && [ ! -f $LOG ]; then echo "Error: $LOG not found" exit 1 @@ -51,7 +44,7 @@ for count in {0..10}; do done # Kill process now that version line or timeout was reached -/usr/bin/kill --verbose --timeout 1000 TERM --timeout 1000 KILL --signal INT $TWS_PID &>/dev/null +pkill -9 -f tws/jars/ &> /dev/null # Clean up ready for next run rm -rf $HOME/.install4j $HOME/.i4j_jres $HOME/tws |