From 456e36cc8cdc39af7cf5e317baf206090c233061 Mon Sep 17 00:00:00 2001 From: ferreo Date: Wed, 20 Nov 2024 14:33:17 +0000 Subject: [PATCH] Fix trailing whitespace in DKMS scripts and update release-nest-v3 file for consistency --- .github/release-nest-v3 | 2 +- .../1001-remove-trailing-whitespace.patch | 42 ------------------- 2 files changed, 1 insertion(+), 43 deletions(-) diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index 56a6051..d8263ee 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -1 \ No newline at end of file +2 \ No newline at end of file diff --git a/debian/patches/1001-remove-trailing-whitespace.patch b/debian/patches/1001-remove-trailing-whitespace.patch index 6d12070..66bef1f 100644 --- a/debian/patches/1001-remove-trailing-whitespace.patch +++ b/debian/patches/1001-remove-trailing-whitespace.patch @@ -27,48 +27,6 @@ diff --git a/dkms.in b/dkms.in index a8f2c6a..371290a 100644 --- a/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() die 6 "Failed to make tarball."