From: Martin Pitt <martin@piware.de>
Date: Tue, 12 May 2020 17:57:29 +0000 (+0200)
Subject: build-devtoolbox: Make aws and vim installation idempotent
X-Git-Url: https://piware.de/gitweb/?a=commitdiff_plain;h=7a94bbb3ba3cccc35a39f413efe77b6da4b1a1bc;p=bin.git

build-devtoolbox: Make aws and vim installation idempotent

In case the underlying container already has them.
---

diff --git a/build-devtoolbox b/build-devtoolbox
index 763aec7..68a5834 100755
--- a/build-devtoolbox
+++ b/build-devtoolbox
@@ -46,7 +46,7 @@ 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
@@ -55,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
 '