build-from-source: combine multiple calls to yum-install

- moves installing libubsan to the previous yum-install.
  Since we already pass --skip-broken, we don't need the
  "|| true".
- also, sort the packages
- also, combine "set" lines

1 files changed, 35 insertions, 39 deletions

diff --git a/contrib/rh-bkr/build-from-source.sh b/contrib/rh-bkr/build-from-source.sh
index b40d8d6233..d399d97203 100755
--- a/contrib/rh-bkr/build-from-source.sh
+++ b/contrib/rh-bkr/build-from-source.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
-set -e
-set -xv
+set -exv
 
 BUILD_DIR="${BUILD_DIR:-/tmp/nm-build}"
 BUILD_ID="${BUILD_ID:-master}"
@@ -20,56 +19,53 @@ if [ -z "$SUDO" ]; then
 fi
 
 $SUDO yum install \
-    git \
-    rpm-build \
-    valgrind \
-    strace \
-    dbus-devel \
-    dbus-glib-devel \
-    wireless-tools-devel \
-    glib2-devel \
-    gobject-introspection-devel \
-    gettext-devel \
-    pkgconfig \
-    libnl3-devel \
     'perl(XML::Parser)' \
     'perl(YAML)' \
+    /usr/bin/dbus-launch \
+    ModemManager-glib-devel \
+    audit-libs-devel \
     automake \
-    ppp-devel \
-    nss-devel \
+    bluez-libs-devel \
+    dbus-devel \
+    dbus-glib-devel \
+    dbus-python \
     dhclient \
-    readline-devel \
-    audit-libs-devel \
+    gettext-devel \
+    git \
+    glib2-devel \
+    gnutls-devel \
+    gobject-introspection-devel \
     gtk-doc \
-    libudev-devel \
-    libuuid-devel \
-    libgudev1-devel \
-    vala-tools \
     iptables \
-    bluez-libs-devel \
-    systemd \
-    libsoup-devel \
+    jansson-devel \
+    libasan \
+    libcurl-devel \
+    libgudev1-devel \
     libndp-devel \
-    ModemManager-glib-devel \
-    newt-devel \
-    /usr/bin/dbus-launch \
-    pygobject3-base \
-    dbus-python \
+    libnl3-devel \
+    libpsl-devel \
     libselinux-devel \
+    libsoup-devel \
+    libubsan \
+    libudev-devel \
+    libuuid-devel \
+    newt-devel \
+    nss-devel \
+    pkgconfig \
     polkit-devel \
+    ppp-devel \
+    pygobject3-base \
+    readline-devel \
+    rpm-build \
+    strace \
+    systemd \
     teamd-devel \
-    jansson-devel \
-    libpsl-devel \
-    libcurl-devel \
-    libasan \
-    gnutls-devel \
+    vala-tools \
+    valgrind \
+    wireless-tools-devel \
     --enablerepo=* --skip-broken \
     -y
 
-$SUDO yum install \
-    libubsan \
-    -y || true
-
 # for the tests, let's pre-load some modules:
 $SUDO modprobe ip_gre