diff options
author | Andrey Vihrov | 2015-10-03 18:51:22 +0300 |
---|---|---|
committer | Andrey Vihrov | 2015-10-03 18:51:22 +0300 |
commit | 1d454089e7addd48cfad9492dd1a9c64fdcabdac (patch) | |
tree | dc6c306e47fa02333f5e4a8edc34a44fe64742ae | |
parent | 06f629b4b28b00271c19fe0a8f24c491e4170376 (diff) | |
download | aur-1d454089e7addd48cfad9492dd1a9c64fdcabdac.tar.gz |
More .install improvements
-rw-r--r-- | broadcom-wl-dkms.install | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/broadcom-wl-dkms.install b/broadcom-wl-dkms.install index ac2f398bda22..b575a092673b 100644 --- a/broadcom-wl-dkms.install +++ b/broadcom-wl-dkms.install @@ -15,20 +15,15 @@ pre_remove() { } dkms_remove() { - local line="$(dkms status -m broadcom-wl)" - # in cases where the passed ${1%%-*} fails, use this as a fallback for detecting - # which version is installed: - # version="$(dkms status broadcom-wl | tr -d ' \n' | awk -F ',' '{print $2}')" - if grep -E 'added|built|installed' <<< "${line}"; then + # In case a different version is installed, use "dkms status broadcom-wl" + # to list and remove installed versions. + + if [ -n "$(dkms status -m broadcom-wl -v ${1%%-*})" ]; then dkms remove -m broadcom-wl -v ${1%%-*} --all || return 1 - else - echo "No current dkms module found, skipping dkms remove" || return 1 fi } dkms_install() { - echo ">>> DKMS: Module install" || return 1 - dkms install -m broadcom-wl -v ${1%%-*} || return 1 cat << EOF || return 1 |