awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests/run.sh: Use $! instead of pgrep 

And yes, $! is specified by POSIX and thus should be portable.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2015-07-18 10:44:16 +02:00
parent c6ede6e96e
commit 534084698b
1 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tests/run.sh
View File

@ -44,8 +44,8 @@ SIZE=1024x768
if [ $HEADLESS = 1 ]; then if [ $HEADLESS = 1 ]; then
"$XVFB" $D -screen 0 ${SIZE}x24 & "$XVFB" $D -screen 0 ${SIZE}x24 &
xserver_pid=$!
sleep 1 sleep 1
xserver_pid=$(pgrep -n Xvfb)
else else
# export XEPHYR_PAUSE=1000 # export XEPHYR_PAUSE=1000
# if [ -f /tmp/.X5-lock ]; then # if [ -f /tmp/.X5-lock ]; then
@ -53,8 +53,8 @@ else
# exit 1 # exit 1
# fi # fi
"$XEPHYR" $D -ac -name xephyr_$D -noreset -screen "$SIZE" $XEPHYR_OPTIONS & "$XEPHYR" $D -ac -name xephyr_$D -noreset -screen "$SIZE" $XEPHYR_OPTIONS &
xserver_pid=$!
sleep 1 sleep 1
xserver_pid=$(pgrep -n Xephyr)
fi fi
# Toggles debugging mode, using XEPHYR_PAUSE. # Toggles debugging mode, using XEPHYR_PAUSE.
# pkill -USR1 Xephyr # pkill -USR1 Xephyr
@ -91,31 +91,13 @@ AWESOME_CLIENT="$root_dir/utils/awesome-client"
# Start awesome. # Start awesome.
start_awesome() { start_awesome() {
( export DISPLAY="$D"
export DISPLAY="$D" cd $root_dir/build
cd $root_dir/build # Setup xrdb, for awesome's xresources backend / queries.
# Setup xrdb, for awesome's xresources backend / queries. echo "Xft.dpi: 96" | DISPLAY="$D" xrdb
echo "Xft.dpi: 96" | xrdb DISPLAY="$D" "$AWESOME" -c "$RC_FILE" $AWESOME_OPTIONS > $awesome_log 2>&1 &
"$AWESOME" -c "$RC_FILE" $AWESOME_OPTIONS > $awesome_log 2>&1 & awesome_pid=$!
) cd - >/dev/null
# Get PID of awesome.
awesome_pid=
max_wait=30
while true; do
awesome_pid="$(pgrep -nf "awesome -c $RC_FILE" || true)"
if [ -n "$awesome_pid" ]; then
break;
fi
max_wait=$(expr $max_wait - 1)
if [ "$max_wait" -lt 0 ]; then
echo "Error: Failed to start awesome (-c $RC_FILE)!"
echo "Log:"
cat "$awesome_log"
exit 1
fi
sleep 0.1
done
# Wait until the interface for awesome-client is ready (D-Bus interface). # Wait until the interface for awesome-client is ready (D-Bus interface).
client_reply= client_reply=