windmill
/
windmill
Code Issues Proposed changes

Drop yum from tools/install_bindep.sh 

There is only dnf for fedora now, and since we don't test on centos we
can drop yum.

Change-Id: I014cf6f5fb6b9fe7745e712cd201e683379dbcf6
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2018-07-29 22:33:36 -04:00
parent 50df1cb5b9
commit 1e818fa0af
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/install_bindep.sh
View File

@ -13,17 +13,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
function is_fedora {
[ -f /usr/bin/yum ] && cat /etc/*release | grep -q -e "Fedora"
}
YUM=yum
if is_fedora; then
YUM=dnf
fi
PACKAGES=$(bindep -b -f bindep.txt test || true) PACKAGES=$(bindep -b -f bindep.txt test || true)
if [ -z $PACKAGES ]; then if [ -z "$PACKAGES" ]; then
exit exit
fi fi
@ -31,5 +22,5 @@ if apt-get -v > /dev/null 2>&1 ; then
sudo apt-get update sudo apt-get update
sudo apt-get --assume-yes install $PACKAGES sudo apt-get --assume-yes install $PACKAGES
else else
sudo $YUM install -y $PACKAGES sudo dnf install -y $PACKAGES
fi fi