Skip to content

Commit 8b16627

Browse files
committed
Merge remote-tracking branch 'tyutin/signal-propagation' into updated
# Conflicts: # build/run-ppm.sh
2 parents 0c028b6 + dbd0520 commit 8b16627

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

build/run-nginx.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
trapIt () { "$@"& pid="$!"; trap "kill -INT $pid" INT TERM; while kill -0 $pid > /dev/null 2>&1; do wait $pid; ec="$?"; done; exit $ec;};
3+
trapIt () { "$@"& pid="$!"; for SGNL in INT TERM CHLD USR1; do trap "kill -$SGNL $pid" "$SGNL"; done; while kill -0 $pid > /dev/null 2>&1; do wait $pid; ec="$?"; done; exit $ec; };
44

55
STATIC=/var/www/
66
args=" $@ "

build/run-ppm.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
trapIt () { "$@"& pid="$!"; trap "kill -INT $pid" INT TERM; while kill -0 $pid > /dev/null 2>&1; do wait $pid; ec="$?"; done; exit $ec;};
3+
trapIt () { "$@"& pid="$!"; for SGNL in INT TERM CHLD USR1; do trap "kill -$SGNL $pid" "$SGNL"; done; while kill -0 $pid > /dev/null 2>&1; do wait $pid; ec="$?"; done; exit $ec; };
44

55
ARGS='--port 8080'
6-
trapIt /ppm/vendor/bin/ppm start --ansi $@
6+
trapIt /ppm/vendor/bin/ppm start --ansi "$@"

build/run-standalone.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
trapIt () { "$@"& pid="$!"; trap "kill -INT $pid" INT TERM; while kill -0 $pid > /dev/null 2>&1; do wait $pid; ec="$?"; done; exit $ec;};
3+
trapIt () { "$@"& pid="$!"; for SGNL in INT TERM CHLD USR1; do trap "kill -$SGNL $pid" "$SGNL"; done; while kill -0 $pid > /dev/null 2>&1; do wait $pid; ec="$?"; done; exit $ec; };
44

55
ARGS='--port 8080'
66
trapIt /ppm/vendor/bin/ppm start --ansi $ARGS $@

0 commit comments

Comments
 (0)