diff --git a/roles/acme_back/tasks/main.yml b/roles/acme_back/tasks/main.yml index 9ee8c9b..fa614f2 100644 --- a/roles/acme_back/tasks/main.yml +++ b/roles/acme_back/tasks/main.yml @@ -15,7 +15,8 @@ name: aur.inc allow_duplicates: true vars: - pkg_names: '["dehydrated-git"]' + packages: + - dehydrated-git aur_user: git ### UPSTREAM END ⇒ ### diff --git a/roles/aur.inc/tasks/install.yml b/roles/aur.inc/tasks/install.yml index 946b075..bfb0999 100644 --- a/roles/aur.inc/tasks/install.yml +++ b/roles/aur.inc/tasks/install.yml @@ -3,7 +3,7 @@ # Copyright © 2018 Y. Gablin, under the GPL-3.0-or-later license. # Full licensing information in the LICENSE file, or gnu.org/licences/gpl-3.0.txt if the file is missing. -# mandatory parameters: pkg_name and aur_user +# mandatory parameters: pkg_name, pre_cmd, aur_user - name: AUR → {{pkg_name}} → read current version shell: | @@ -40,6 +40,20 @@ - name: AUR → {{pkg_name}} → work with the recipe block: + - name: AUR → {{pkg_name}} → run custom pre-processing commands + shell: "{{pre_cmd}}" + args: + chdir: /var/tmp/{{aurjson.json.results[0].PackageBase}} + warn: false + when: pre_cmd + register: debugCustom + + - name: AUR → {{pkg_name}} → see custom pre-processing commands’ result + debug: + var: debugCustom + when: pre_cmd + changed_when: false + - name: AUR → {{pkg_name}} → read the real version command: > bash -c diff --git a/roles/aur.inc/tasks/main.yml b/roles/aur.inc/tasks/main.yml index 9c54989..af78355 100644 --- a/roles/aur.inc/tasks/main.yml +++ b/roles/aur.inc/tasks/main.yml @@ -18,8 +18,9 @@ - name: AUR → installation include_tasks: install.yml vars: - pkg_name: "{{item}}" - with_items: "{{pkg_names}}" + pkg_name: "{{(item is mapping) | ternary(item.pkg, item)}}" + pre_cmd: "{{(item is mapping) | ternary(item.pre, '')}}" + with_items: "{{packages}}" always: - name: AUR → remove base-devel and dependencies shell: | diff --git a/roles/dmz_ihmldap/tasks/main.yml b/roles/dmz_ihmldap/tasks/main.yml index 24abb3a..a56c73e 100644 --- a/roles/dmz_ihmldap/tasks/main.yml +++ b/roles/dmz_ihmldap/tasks/main.yml @@ -15,10 +15,8 @@ name: aur.inc allow_duplicates: true vars: - pkg_names: | - [ - "ldap-account-manager" - ] + packages: + - ldap-account-manager aur_user: git ### UPSTREAM END ⇒ ### diff --git a/roles/dmz_movim_front/tasks/main.yml b/roles/dmz_movim_front/tasks/main.yml index f084bb2..a457883 100644 --- a/roles/dmz_movim_front/tasks/main.yml +++ b/roles/dmz_movim_front/tasks/main.yml @@ -15,11 +15,9 @@ name: aur.inc allow_duplicates: true vars: - pkg_names: | - [ - "php-zmq", - "movim" - ] + packages: + - php-zmq + - movim aur_user: git register: software diff --git a/roles/dmz_prosody_front/tasks/main.yml b/roles/dmz_prosody_front/tasks/main.yml index 1d90036..5732734 100644 --- a/roles/dmz_prosody_front/tasks/main.yml +++ b/roles/dmz_prosody_front/tasks/main.yml @@ -26,22 +26,20 @@ name: aur.inc allow_duplicates: true vars: - pkg_names: | - [ - "lua52-event", - "lua52-lpty", - "prosody-mod-auth-imap-hg", - "prosody-mod-auto-accept-subscriptions-hg", - "prosody-mod-filter-chatstates-hg", - "prosody-mod-http-upload-external-hg", - "prosody-mod-offline-email-hg", - "prosody-mod-smacks", - "prosody-mod-throttle_presence" - ] + packages: + - lua52-event + - lua52-lpty + - prosody-mod-auth-imap-hg + - prosody-mod-auto-accept-subscriptions-hg + - prosody-mod-filter-chatstates-hg + - prosody-mod-http-upload-external-hg + - prosody-mod-offline-email-hg + - prosody-mod-smacks + - prosody-mod-throttle_presence aur_user: git - # "prosody-mod-log-auth", - # "prosody-mod-mam-archive", - # "prosody-mod-mam-muc", + # - prosody-mod-log-auth + # - prosody-mod-mam-archive + # - prosody-mod-mam-muc ### UPSTREAM END ⇒ ### - name: merge upstream diff --git a/roles/dmz_wallabag_front/tasks/main.yml b/roles/dmz_wallabag_front/tasks/main.yml index 3af7ba7..92ed44b 100644 --- a/roles/dmz_wallabag_front/tasks/main.yml +++ b/roles/dmz_wallabag_front/tasks/main.yml @@ -15,10 +15,8 @@ name: aur.inc allow_duplicates: true vars: - pkg_names: | - [ - "wallabag" - ] + packages: + - wallabag aur_user: git ### UPSTREAM END ⇒ ### diff --git a/roles/nextcloud_back/tasks/main.yml b/roles/nextcloud_back/tasks/main.yml index f04bf4b..dfffd15 100644 --- a/roles/nextcloud_back/tasks/main.yml +++ b/roles/nextcloud_back/tasks/main.yml @@ -26,10 +26,8 @@ name: aur.inc allow_duplicates: true vars: - pkg_names: | - [ - "collabora-online-server-nodocker" - ] + packages: + - collabora-online-server-nodocker aur_user: git - name: create the nextcloud user diff --git a/roles/privatebin/tasks/main.yml b/roles/privatebin/tasks/main.yml index 951acdc..721e480 100644 --- a/roles/privatebin/tasks/main.yml +++ b/roles/privatebin/tasks/main.yml @@ -15,10 +15,8 @@ name: aur.inc allow_duplicates: true vars: - pkg_names: | - [ - "privatebin" - ] + packages: + - privatebin aur_user: git ### UPSTREAM END ⇒ ### diff --git a/roles/pyruse/tasks/main.yml b/roles/pyruse/tasks/main.yml index cb3a857..7c21b2d 100644 --- a/roles/pyruse/tasks/main.yml +++ b/roles/pyruse/tasks/main.yml @@ -19,10 +19,8 @@ name: aur.inc allow_duplicates: true vars: - pkg_names: | - [ - "pyruse" - ] + packages: + - pyruse ### UPSTREAM END ⇒ ### - name: merge upstream diff --git a/roles/ssowat/tasks/main.yml b/roles/ssowat/tasks/main.yml index 494c114..6bb9f50 100644 --- a/roles/ssowat/tasks/main.yml +++ b/roles/ssowat/tasks/main.yml @@ -22,15 +22,13 @@ name: aur.inc allow_duplicates: true vars: - pkg_names: | - [ - "lua51-lualdap-git", - "ssowat-git" - ] + packages: + - lua51-lualdap-git + - ssowat-git aur_user: git # USUALLY NOT UP-TO-DATE… :-( -# "nginx-mainline-mod-ndk", -# "nginx-mainline-mod-lua", +# - nginx-mainline-mod-ndk +# - nginx-mainline-mod-lua ### UPSTREAM END ⇒ ### - name: merge upstream