Bladeren bron

Rewritten using replace to make one line.

pull/150/head
Martin Horak 6 jaren geleden
bovenliggende
commit
77f2d02118
1 gewijzigde bestanden met toevoegingen van 3 en 6 verwijderingen
  1. +3
    -6
      linux/system/repo.sls

+ 3
- 6
linux/system/repo.sls Bestand weergeven

@@ -85,8 +85,7 @@ linux_repo_{{ name }}_pin:

linux_repo_{{ name }}_key:
cmd.wait:
- name: |
echo '{{ repo.key|indent(8, false) }}' | apt-key add -
- name: echo -e '{{ repo.key|replace('\n', '\\n') }}' | apt-key add -
- watch:
- file: default_repo_list

@@ -142,10 +141,8 @@ linux_repo_{{ name }}:

linux_repo_{{ name }}_key:
cmd.run:
- name: |
echo '{{ repo.key|indent(8, false) }}' | apt-key add -
- unless: |
apt-key finger --with-colons | grep -qF $(echo '{{ repo.key|indent(8, false) }}' | gpg --with-fingerprint --with-colons | grep -E '^fpr')
- name: echo -e '{{ repo.key|replace('\n', '\\n') }}' | apt-key add -
- unless: apt-key finger --with-colons | grep -qF $(echo -e '{{ repo.key|replace('\n', '\\n') }}' | gpg --with-fingerprint --with-colons | grep -E '^fpr')
- require_in:
- pkgrepo: linux_repo_{{ name }}


Laden…
Annuleren
Opslaan