File tree Expand file tree Collapse file tree 1 file changed +6
-2
lines changed Expand file tree Collapse file tree 1 file changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -43,10 +43,12 @@ safe_command() {
43
43
checksum () {
44
44
l_file=" $1 "
45
45
checksum_exec=" "
46
+ checksum_args=" "
46
47
if command -v sha256sum > /dev/null; then
47
48
checksum_exec=" sha256sum"
48
49
elif command -v shasum > /dev/null; then
49
- checksum_exec=" shasum -a 256"
50
+ checksum_exec=" shasum"
51
+ checksum_args=" -a 256"
50
52
elif command -v sha1sum > /dev/null; then
51
53
checksum_exec=" sha1sum"
52
54
elif command -v md5 > /dev/null; then
@@ -56,7 +58,7 @@ checksum() {
56
58
log_err " ERROR: No supported checksum command found!"
57
59
exit 1
58
60
fi
59
- " ${checksum_exec} " < " ${l_file} "
61
+ ${checksum_exec} ${checksum_args} < " ${l_file} "
60
62
}
61
63
62
64
rand () {
@@ -180,9 +182,11 @@ download_if_needed "${jdkw_wrapper}" "${jdkw_path}"
180
182
# Run the command in the backround (with all the trouble that entails)
181
183
# NOTE: Alternatively convert this to an exec if we don't need to output the
182
184
# wrapper mismatch at the end; e.g. make that a hard precondition to running.
185
+ set -m
183
186
trap ' kill -TERM ${impl_pid}' TERM INT
184
187
" ${jdkw_path} /${jdkw_impl} " " $@ " &
185
188
impl_pid=$!
189
+ fg
186
190
wait ${impl_pid} > /dev/null 2>&1
187
191
wait_result=$?
188
192
if [ ${wait_result} -ne 127 ]; then
You can’t perform that action at this time.
0 commit comments