Skip to content

Commit c866871

Browse files
committed
unnecessary 'set -m' in test / auto files
I also had to fix some bugs so the test / auto files worked with non-interactive shells.
1 parent 111cf1a commit c866871

File tree

5 files changed

+13
-11
lines changed

5 files changed

+13
-11
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env sh
22

3-
set -m
3+
# set -m
44

55
charmiglio & charmiglio & charmiglio & gsh check

missions/intermediate/05_background/charmiglio.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ command=$(gettext "charmiglio")
66

77

88
file="$MISSION_DIR/ascii-art/f$((1 + $(RANDOM)%6))"
9-
indent=$(echo " " | head -c "$((4 * ($(RANDOM)%8)))")
9+
indent=$(echo " " | head -c "$((2 + 4 * ($(RANDOM)%8)))")
1010

1111
rm -f "$GSH_TMP/charmiglio.pids"
12-
for i in $(seq $((5 + $(RANDOM)%10)))
12+
for i in $(seq $((5 + $(RANDOM)%5)))
1313
do
1414
echo "$indent *"
1515
sleep 0.1

missions/intermediate/05_background/test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env sh
22

3-
set -m
3+
# set -m
44

55
gsh assert check false
66
charmiglio & gsh assert check false
@@ -11,7 +11,7 @@ charmiglio & charmiglio & charmiglio & charmiglio & gsh assert check true
1111
charmiglio & charmiglio & charmiglio
1212
gsh assert check false
1313

14-
charmiglio; charmiglio; charmiglio;
14+
charmiglio; charmiglio; charmiglio
1515
gsh assert check false
1616

1717

missions/intermediate/06_control-C/auto.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
#!/usr/bin/env sh
22

3-
set -m
3+
# set -m
44

55
for c in a b c d e f
66
do
7-
eval "$(gettext Charmiglio)" "$c$c$c$c" 2>/dev/null &
7+
eval "$(gettext Charmiglio) $c$c$c$c &" 2>/dev/null
88
PID=$!
99
sleep 4
10-
kill -s INT "-$PID" 2> /dev/null
10+
# NOTE: SIGINT signal doesn't work on non-interactive systems
11+
kill "$PID" 2> /dev/null
1112

1213
case "$(cat "$GSH_TMP/control-C")" in
1314
*[!0-9]*)

missions/intermediate/06_control-C/test.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
#!/usr/bin/env sh
22

3-
set -m
3+
# set -m
44

55
do_test() {
66
nb=$1
77
delay=$2
88

99
for c in $(echo "a b c d e f g h i j" | cut -d' ' -f1-$nb)
1010
do
11-
eval "$(gettext Charmiglio)" "$c$c$c$c" 2>/dev/null &
11+
eval "$(gettext Charmiglio) $c$c$c$c &" 2>/dev/null
1212
PID=$!
1313
sleep "$delay"
14-
kill -s INT "-$PID" 2> /dev/null
14+
# NOTE: SIGINT signal doesn't work on non-interactive systems
15+
kill "$PID" 2> /dev/null
1516

1617
case "$(cat "$GSH_TMP/control-C")" in
1718
*[!0-9]*)

0 commit comments

Comments
 (0)