X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Fgpg_import_key.sh;h=f45e40919b8616c9b887d12157081edaaf3beb2e;hb=2efecc1438fdaed8aa7e9f4eb4c4b42b4fbef1fc;hp=3afeda83981f94432086f709587861f43f2db3d3;hpb=dbc2d128db8ab36e52f245c064b3f68f0953ecb2;p=releng.git

diff --git a/utils/gpg_import_key.sh b/utils/gpg_import_key.sh
old mode 100644
new mode 100755
index 3afeda839..f45e40919
--- a/utils/gpg_import_key.sh
+++ b/utils/gpg_import_key.sh
@@ -7,25 +7,42 @@
 # 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
   echo "error with install"
-  exit 1
+  exit 0
 fi
 
 if ! which gsutil;
   then echo "error gsutil not installed";
-  exit 1
+  exit 0
 fi
 
 if gpg2 --list-keys | grep "opnfv-helpdesk@rt.linuxfoundation.org"; then
@@ -33,10 +50,11 @@ if gpg2 --list-keys | grep "opnfv-helpdesk@rt.linuxfoundation.org"; then
 else
   if [ -z "$NODE_NAME" ];
     then echo "Cannot find node name"
-      exit 1
+      exit 0
     else echo "Importing key for '$NODE_NAME'";
      gsutil cp gs://opnfv-signing-keys/"$NODE_NAME"-subkey .
      gpg2 --import "$NODE_NAME"-subkey
      rm -f "$NODE_NAME"-subkey
    fi
 fi
+