Skip to content

Commit f11eb47

Browse files
committed
Upstream.
1 parent c3ad629 commit f11eb47

File tree

3 files changed

+388
-299
lines changed

3 files changed

+388
-299
lines changed

_lib/ubiquitous_bash

compile.sh

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ _ub_cksum_special_derivativeScripts_contents() {
3636
#export ub_setScriptChecksum_disable='true'
3737
( [[ -e "$0".nck ]] || [[ "${BASH_SOURCE[0]}" != "${0}" ]] || [[ "$1" == '--profile' ]] || [[ "$1" == '--script' ]] || [[ "$1" == '--call' ]] || [[ "$1" == '--return' ]] || [[ "$1" == '--devenv' ]] || [[ "$1" == '--shell' ]] || [[ "$1" == '--bypass' ]] || [[ "$1" == '--parent' ]] || [[ "$1" == '--embed' ]] || [[ "$1" == '--compressed' ]] || [[ "$0" == "/bin/bash" ]] || [[ "$0" == "-bash" ]] || [[ "$0" == "/usr/bin/bash" ]] || [[ "$0" == "bash" ]] ) && export ub_setScriptChecksum_disable='true'
3838
export ub_setScriptChecksum_header='2591634041'
39-
export ub_setScriptChecksum_contents='550187666'
39+
export ub_setScriptChecksum_contents='1716040766'
4040

4141
# CAUTION: Symlinks may cause problems. Disable this test for such cases if necessary.
4242
# WARNING: Performance may be crucial here.
@@ -2826,12 +2826,32 @@ _terminateAll() {
28262826
while read -r currentPID
28272827
do
28282828
pkill -P "$currentPID"
2829+
sudo -n pkill -P "$currentPID"
28292830
kill "$currentPID"
2831+
sudo -n kill "$currentPID"
28302832
done < "$processListFile"
28312833
2834+
if [[ "$ub_kill" == "true" ]]
2835+
then
2836+
sleep 9
2837+
while read -r currentPID
2838+
do
2839+
pkill -KILL -P "$currentPID"
2840+
sudo -n pkill -KILL -P "$currentPID"
2841+
kill -KILL "$currentPID"
2842+
sudo -n kill -KILL "$currentPID"
2843+
done < "$processListFile"
2844+
fi
2845+
28322846
rm "$processListFile"
28332847
}
28342848
2849+
_killAll() {
2850+
export ub_kill="true"
2851+
_terminateAll
2852+
export ub_kill=
2853+
}
2854+
28352855
_condition_lines_zero() {
28362856
local currentLineCount
28372857
currentLineCount=$(wc -l)

0 commit comments

Comments
 (0)