build-devtoolbox: Make aws and vim installation idempotent

[bin.git] / build-devtoolbox

diff --git a/build-devtoolbox b/build-devtoolbox
index af29ec521593839674998988d1a4e41c72d82418..68a583483df4f00e1456c7d208e54339542ee068 100755 (executable)
--- a/build-devtoolbox
+++ b/build-devtoolbox
@@ -36,16 +36,17 @@ sudo dnf install -y make npm fontconfig git valgrind chromium \
     libvirt-daemon-kvm libvirt-client python3-libvirt \
     virt-viewer virt-install libappstream-glib \
     expect python3-pycodestyle python3-pyflakes \
-    fedpkg rhpkg /usr/bin/oc /usr/bin/genisoimage \
+    fedpkg rhpkg /usr/bin/oc /usr/bin/genisoimage /usr/bin/pip \
     man-pages socat wget genisoimage vim-X11 \
     ansible standard-test-roles rsync strace diffstat \
-    pwgen glibc-langpack-en tig twine dbus-daemon
+    pwgen glibc-langpack-en tig twine dbus-daemon waiverdb-cli \
+    /usr/bin/scanimage /usr/bin/pngquant /usr/bin/convert /usr/bin/pdfjoin
 
 sudo dnf debuginfo-install -y glib2 glibc libssh gnutls
 
 sudo dnf clean packages
 
-sudo pip install awscli
+type aws >/dev/null 2>&1 || sudo pip install awscli
 
 # unbreak kerberos; https://github.com/debarshiray/toolbox/issues/235
 cat <<EOF | sudo tee /etc/krb5.conf.d/0_file_ccache
@@ -54,5 +55,5 @@ cat <<EOF | sudo tee /etc/krb5.conf.d/0_file_ccache
 EOF
 
 # vim-X11 does not ship vim binary
-sudo ln -s vimx /usr/bin/vim
+type vim >/dev/null 2>&1 || sudo ln -s vimx /usr/bin/vim
 '