generated from general-packages/pika-pkg-template
Fix trailing whitespace in DKMS scripts and update release-nest-v3 file for consistency
Some checks failed
PikaOS Package Build & Release (amd64-v3) / build (push) Failing after 44s
Some checks failed
PikaOS Package Build & Release (amd64-v3) / build (push) Failing after 44s
This commit is contained in:
parent
c4add533e4
commit
456e36cc8c
2
.github/release-nest-v3
vendored
2
.github/release-nest-v3
vendored
@ -1 +1 @@
|
|||||||
1
|
2
|
@ -27,48 +27,6 @@ diff --git a/dkms.in b/dkms.in
|
|||||||
index a8f2c6a..371290a 100644
|
index a8f2c6a..371290a 100644
|
||||||
--- a/dkms.in
|
--- a/dkms.in
|
||||||
+++ b/dkms.in
|
+++ b/dkms.in
|
||||||
@@ -96,19 +96,19 @@ invoke_command()
|
|
||||||
local cmd_mode="$4"
|
|
||||||
local exitval=0
|
|
||||||
local progresspid
|
|
||||||
-
|
|
||||||
+
|
|
||||||
[[ $verbose ]] && echo -e "$cmd" || echo -en "$cmd_description..."
|
|
||||||
|
|
||||||
if [[ $cmd_mode == background && ! $verbose && $package_name != dkms*_test ]]; then
|
|
||||||
- while true ; do
|
|
||||||
+ while true ; do
|
|
||||||
sleep 3
|
|
||||||
echo -n "."
|
|
||||||
done &
|
|
||||||
progresspid=$!
|
|
||||||
fi
|
|
||||||
|
|
||||||
- if [[ -n "$cmd_output_file" ]]; then
|
|
||||||
- ( eval "$cmd" ) >> "$cmd_output_file" 2>&1
|
|
||||||
+ if [[ -n "$cmd_output_file" ]]; then
|
|
||||||
+ ( eval "$cmd" ) >> "$cmd_output_file" 2>&1
|
|
||||||
exitval=$?
|
|
||||||
elif [[ -z "$cmd_output_file" && $cmd_mode == background && ! $verbose ]]; then
|
|
||||||
( eval "$cmd" ) >/dev/null 2>&1
|
|
||||||
@@ -119,15 +119,15 @@ invoke_command()
|
|
||||||
fi
|
|
||||||
|
|
||||||
[ -n "$progresspid" ] && kill "$progresspid" >/dev/null 2>&1
|
|
||||||
-
|
|
||||||
- if (( exitval > 0)); then
|
|
||||||
+
|
|
||||||
+ if (( exitval > 0 )); then
|
|
||||||
echo -en "(bad exit status: $exitval)"
|
|
||||||
# Print the failing command without the clunky redirection
|
|
||||||
[[ ! $verbose ]] && echo -en "\nFailed command:\n$1"
|
|
||||||
else
|
|
||||||
echo " done."
|
|
||||||
fi
|
|
||||||
-
|
|
||||||
+
|
|
||||||
return "$exitval"
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1941,7 +1941,7 @@ make_tarball()
|
@@ -1941,7 +1941,7 @@ make_tarball()
|
||||||
die 6 "Failed to make tarball."
|
die 6 "Failed to make tarball."
|
||||||
|
Loading…
Reference in New Issue
Block a user