From 29847df16820084b8da77e1481af37c1b049f79a Mon Sep 17 00:00:00 2001 From: Leonardo Di Donato Date: Tue, 21 Jan 2020 11:26:45 +0000 Subject: [PATCH] fix(scripts/rpm): substitute underscores with dashes for RPM version Co-authored-by: Lorenzo Fontana Signed-off-by: Leonardo Di Donato --- scripts/rpm/postinstall | 9 +++++---- scripts/rpm/preuninstall | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/rpm/postinstall b/scripts/rpm/postinstall index f205c644..8d971247 100755 --- a/scripts/rpm/postinstall +++ b/scripts/rpm/postinstall @@ -14,11 +14,12 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -dkms add -m falco -v %{version} --rpm_safe_upgrade +rpm_v=%{version} +mod_version=${rpm_v//_/-} +dkms add -m falco -v $mod_version --rpm_safe_upgrade if [ `uname -r | grep -c "BOOT"` -eq 0 ] && [ -e /lib/modules/`uname -r`/build/include ]; then - dkms build -m falco -v %{version} - dkms install --force -m falco -v %{version} + dkms build -m falco -v $mod_version + dkms install --force -m falco -v $mod_version elif [ `uname -r | grep -c "BOOT"` -gt 0 ]; then echo -e "" echo -e "Module build for the currently running kernel was skipped since you" diff --git a/scripts/rpm/preuninstall b/scripts/rpm/preuninstall index 8990662d..dbb05cdd 100755 --- a/scripts/rpm/preuninstall +++ b/scripts/rpm/preuninstall @@ -19,5 +19,6 @@ if [ $1 = 0 ]; then /sbin/service falco stop > /dev/null 2>&1 /sbin/chkconfig --del falco fi - -dkms remove -m falco -v %{version} --all --rpm_safe_upgrade +rpm_v=%{version} +mod_version=${rpm_v//_/-} +dkms remove -m falco -v $mod_version --all --rpm_safe_upgrade