commit 1b2a16e5dc5f347c78eaa83bd121bc2dc3b5784d Author: Igor Vuk <parcijala(a)gmail.com&gt; Date: Mon May 16 17:47:40 2016 +0200 Replace some tabs with spaces to match the style of the akmods script akmods | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) --- diff --git a/akmods b/akmods index d632743..e2b6e06 100755 --- a/akmods +++ b/akmods @@ -246,9 +246,9 @@ buildinstall_kmod() # akmods_echo will log to this file from now on as well kmodlogfile="/var/cache/akmods/${this_kmodname}/.last.log" - # Unset TMPDIR since it is misused by "runuser" - # https://bugzilla.rpmfusion.org/show_bug.cgi?id=2596 - unset TMPDIR + # Unset TMPDIR since it is misused by "runuser" + # https://bugzilla.rpmfusion.org/show_bug.cgi?id=2596 + unset TMPDIR # build module using akmod akmods_echo 1 4 "Building RPM using the command '$(which akmodsbuild) --target $(uname -m) --kernels ${this_kernelver} ${this_kmodsrpm}'" @@ -276,14 +276,13 @@ buildinstall_kmod() # dnf/yum install - repository disabled on purpose see rfbz#3350 akmods_echo 1 4 "Installing newly built rpms" - if [ -f /usr/bin/dnf ] - then - akmods_echo 1 4 "DNF detected" - dnf -y install --disablerepo='*' $(find "${tmpdir}results" -type f -name '*.rpm' | grep -v debuginfo) >> "${kmodlogfile}" 2>&1 - else - akmods_echo 1 4 "DNF not found, using YUM instead." - yum -y install --disablerepo='*' $(find "${tmpdir}results" -type f -name '*.rpm' | grep -v debuginfo) >> "${kmodlogfile}" 2>&1 - fi + if [ -f /usr/bin/dnf ]; then + akmods_echo 1 4 "DNF detected" + dnf -y install --disablerepo='*' $(find "${tmpdir}results" -type f -name '*.rpm' | grep -v debuginfo) >> "${kmodlogfile}" 2>&1 + else + akmods_echo 1 4 "DNF not found, using YUM instead." + yum -y install --disablerepo='*' $(find "${tmpdir}results" -type f -name '*.rpm' | grep -v debuginfo) >> "${kmodlogfile}" 2>&1 + fi local returncode=$? # place the newly built rpms where user expects them