From d38eb777b696f0458fa1f5fa5e00383e365dde6e Mon Sep 17 00:00:00 2001
From: Aric Gardner <agardner@linuxfoundation.org>
Date: Mon, 18 Jul 2016 11:53:13 -0400
Subject: Add support for ubuntu (keep support for centos)

Compass signing was failing on ubuntu

Change-Id: Ieda6cfd67c7b36045b0a30c01a0eb3f0e7165710
Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
---
 utils/gpg_import_key.sh | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

(limited to 'utils/gpg_import_key.sh')

diff --git a/utils/gpg_import_key.sh b/utils/gpg_import_key.sh
index 80b7c397e..bb11f0d45 100755
--- a/utils/gpg_import_key.sh
+++ b/utils/gpg_import_key.sh
@@ -7,15 +7,32 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-
 function isinstalled {
-if rpm -q "$@" >/dev/null 2>&1; then
-  true
-    else
-      echo installing "$1"
-      sudo yum install "$1"
-  false
+
+source /etc/os-release; echo ${ID/*, /}
+
+if [[ ${ID/*, /} =~ "centos" ]]; then
+  if rpm -q "$@" >/dev/null 2>&1; then
+    true
+      else
+        echo installing "$1"
+        sudo yum install "$1"
+    false
+  fi
+
+elif [[ ${ID/*, /} =~ "ubuntu" ]]; then
+  if dpkg-query -W -f'${Status}' "$@" 2>/dev/null | grep -q "ok installed"; then
+    true
+      else
+        echo installing "$1"
+        sudo apt-get install -y "$1"
+    false
+  fi
+else
+  echo "Distro not supported"
+  exit 0
 fi
+
 }
 
 if ! isinstalled gnupg2; then
-- 
cgit 1.2.3-korg