Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-05 20:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

needed to quote variable

Browse source
This commit is contained in:
Eric House 2013-07-09 18:07:03 -07:00
parent f5696334a9
commit 48fbf15a69
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
xwords4/linux/scripts/discon_ok2.sh
View file

@ -224,7 +224,7 @@ build_cmds() {
fi fi
PARAMS="$PARAMS --drop-nth-packet $DROP_N $PLAT_PARMS" PARAMS="$PARAMS --drop-nth-packet $DROP_N $PLAT_PARMS"
# PARAMS="$PARAMS --split-packets 2" # PARAMS="$PARAMS --split-packets 2"
if [ -n $SEND_CHAT ]; then if [ -n "$SEND_CHAT" ]; then
PARAMS="$PARAMS --send-chat $SEND_CHAT" PARAMS="$PARAMS --send-chat $SEND_CHAT"
fi fi
# PARAMS="$PARAMS --savefail-pct 10" # PARAMS="$PARAMS --savefail-pct 10"
@ -328,7 +328,7 @@ kill_from_log() {
if [ -n "$RELAYID" ]; then if [ -n "$RELAYID" ]; then
OBITS="$OBITS -d $RELAYID" OBITS="$OBITS -d $RELAYID"
if [ 0 -eq $(($RANDOM%2)) ]; then if [ 0 -eq $(($RANDOM%2)) ]; then
../relay/rq -a $HOST $OBITS 2>/dev/null || true ../relay/rq -a $HOST $OBITS 2>/dev/null || /bin/true
OBITS="" OBITS=""
fi fi
return 0 # success return 0 # success
@ -344,7 +344,7 @@ maybe_resign() {
if grep -q XWRELAY_ALLHERE $LOG; then if grep -q XWRELAY_ALLHERE $LOG; then
if [ 0 -eq $(($RANDOM % $RESIGN_RATIO)) ]; then if [ 0 -eq $(($RANDOM % $RESIGN_RATIO)) ]; then
echo "making $LOG $(connName $LOG) resign..." echo "making $LOG $(connName $LOG) resign..."
kill_from_log $LOG && close_device $KEY $DEADDIR "resignation forced" || true kill_from_log $LOG && close_device $KEY $DEADDIR "resignation forced" || /bin/true
fi fi
fi fi
fi fi
@ -392,18 +392,18 @@ check_game() {
# kill_from_logs $OTHERS $KEY # kill_from_logs $OTHERS $KEY
for ID in $OTHERS $KEY; do for ID in $OTHERS $KEY; do
echo -n "${LOGS[$ID]}, " echo -n "${LOGS[$ID]}, "
kill_from_log ${LOGS[$ID]} || true kill_from_log ${LOGS[$ID]} || /bin/true
close_device $ID $DONEDIR "game over" close_device $ID $DONEDIR "game over"
done done
echo "" echo ""
# XWRELAY_ERROR_DELETED may be old # XWRELAY_ERROR_DELETED may be old
elif grep -q 'relay_error_curses(XWRELAY_ERROR_DELETED)' $LOG; then elif grep -q 'relay_error_curses(XWRELAY_ERROR_DELETED)' $LOG; then
echo "deleting $LOG $(connName $LOG) b/c another resigned" echo "deleting $LOG $(connName $LOG) b/c another resigned"
kill_from_log $LOG || true kill_from_log $LOG || /bin/true
close_device $KEY $DEADDIR "other resigned" close_device $KEY $DEADDIR "other resigned"
elif grep -q 'relay_error_curses(XWRELAY_ERROR_DEADGAME)' $LOG; then elif grep -q 'relay_error_curses(XWRELAY_ERROR_DEADGAME)' $LOG; then
echo "deleting $LOG $(connName $LOG) b/c another resigned" echo "deleting $LOG $(connName $LOG) b/c another resigned"
kill_from_log $LOG || true kill_from_log $LOG || /bin/true
close_device $KEY $DEADDIR "other resigned" close_device $KEY $DEADDIR "other resigned"
else else
maybe_resign $KEY maybe_resign $KEY
@ -435,7 +435,7 @@ get_relayid() {
update_devid_cmd() { update_devid_cmd() {
KEY=$1 KEY=$1
HELP="$(${APPS[$KEY]} --help 2>&1 || true)" HELP="$(${APPS[$KEY]} --help 2>&1 || /bin/true)"
if echo $HELP | grep -q '\-\-devid'; then if echo $HELP | grep -q '\-\-devid'; then
CMD="--devid LINUX_TEST_$(printf %.5d ${KEY})" CMD="--devid LINUX_TEST_$(printf %.5d ${KEY})"
LOG=${LOGS[$KEY]} LOG=${LOGS[$KEY]}
@ -480,7 +480,7 @@ run_cmds() {
launch $KEY & launch $KEY &
PID=$! PID=$!
# renice doesn't work on one of my machines... # renice doesn't work on one of my machines...
renice -n 1 -p $PID >/dev/null || /bin/true renice -n 1 -p $PID >/dev/null 2>&1 || /bin/true
PIDS[$KEY]=$PID PIDS[$KEY]=$PID
ROOM_PIDS[$ROOM]=$PID ROOM_PIDS[$ROOM]=$PID
MINEND[$KEY]=$(($NOW + $MINRUN)) MINEND[$KEY]=$(($NOW + $MINRUN))
@ -489,7 +489,7 @@ run_cmds() {
if [ -d /proc/$PID ]; then if [ -d /proc/$PID ]; then
SLEEP=$((${MINEND[$KEY]} - $NOW)) SLEEP=$((${MINEND[$KEY]} - $NOW))
[ $SLEEP -gt 0 ] && sleep $SLEEP [ $SLEEP -gt 0 ] && sleep $SLEEP
kill $PID || true kill $PID || /bin/true
wait $PID wait $PID
fi fi
PIDS[$KEY]=0 PIDS[$KEY]=0
@ -500,7 +500,7 @@ run_cmds() {
fi fi
done done
[ -n "$OBITS" ] && ../relay/rq -a $HOST $OBITS 2>/dev/null || true [ -n "$OBITS" ] && ../relay/rq -a $HOST $OBITS 2>/dev/null || /bin/true
# kill any remaining games # kill any remaining games
if [ $COUNT -gt 0 ]; then if [ $COUNT -gt 0 ]; then
@ -541,7 +541,7 @@ run_via_rq() {
launch $KEY & launch $KEY &
PID=$! PID=$!
sleep 2 sleep 2
kill $PID || true kill $PID || /bin/true
wait $PID wait $PID
fi fi
[ "$DROP_N" -ge 0 ] && increment_drop $KEY [ "$DROP_N" -ge 0 ] && increment_drop $KEY