Fix `gpg` so it works on different distros

[arvados-formula.git] / arvados / ruby / package / install.sls

diff --git a/arvados/ruby/package/install.sls b/arvados/ruby/package/install.sls
index 8d9ed6b2f816292983dc9ec315fdf73a2281e1bc..27822822b5f4a9654553b5b5df68a4c903382398 100644 (file)
--- a/arvados/ruby/package/install.sls
+++ b/arvados/ruby/package/install.sls
@@ -18,9 +18,8 @@
 arvados-ruby-package-install-ruby-rvm-deps-centos-scl-release-pkg-installed:
   pkg.installed:
     - name: centos-release-scl
-    - require_in:
 
-arvados-ruby-package-install-ruby-rvm-deps-rh-postgres11-libs-pkg-installed:
+arvados-ruby-package-install-ruby-rvm-deps-rh-postgres-libs-pkg-installed:
   pkg.installed:
     - name: rh-postgresql{{ arvados.api.postgresql_version }}-postgresql-libs
     - unless: rpm -q postgresql{{ arvados.api.postgresql_version }}-libs
@@ -33,15 +32,15 @@ arvados-ruby-package-install-ruby-rvm-deps-rh-postgres11-libs-pkg-installed:
   # Doing it the hard way
 arvados-ruby-package-install-gpg-cmd-run-gpg-michal-papis:
   cmd.run:
-    - name: /bin/gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
+    - name: gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
     - unless:
-      - /bin/gpg --list-keys 409B6B1796C275462A1703113804BB82D39DC0E3
+      - gpg --list-keys 409B6B1796C275462A1703113804BB82D39DC0E3
 
 arvados-ruby-package-install-gpg-cmd-run-gpg-piotr-kuczynski:
   cmd.run:
-    - name: /bin/gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+    - name: gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
     - unless:
-      - /bin/gpg --list-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+      - gpg --list-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 
 arvados-ruby-package-install-rvm-cmd-run-curl:
   cmd.run:
@@ -63,5 +62,6 @@ arvados-ruby-package-install-ruby-rvm-installed:
 arvados-ruby-package-install-ruby-pkg-installed:
   pkg.installed:
     - name: {{ arvados.ruby.pkg }}
+
   {%- endif %}
 {%- endif %}