From 23d1c2122a57ed753de18fd089441260b281fb29 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sep 06 2022 15:05:30 +0000 Subject: Switch from egrep to grep -E --- diff --git a/roles/check-sources-file/tasks/main.yaml b/roles/check-sources-file/tasks/main.yaml index 8000a1d..46550fb 100644 --- a/roles/check-sources-file/tasks/main.yaml +++ b/roles/check-sources-file/tasks/main.yaml @@ -15,7 +15,7 @@ spec_name: "{{ get_spec_name.stdout }}" - name: Discover sources - shell: "spectool {{ spec_name }} 2> /dev/null | egrep '^Source0' | egrep 'https?://' | sed 's/Source.*: //'" + shell: "spectool {{ spec_name }} 2> /dev/null | grep -E '^Source0' | grep -E 'https?://' | sed 's/Source.*: //'" args: chdir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}" register: spectool_cmd diff --git a/roles/repo-install-rpm/tasks/install_repo_packages.yaml b/roles/repo-install-rpm/tasks/install_repo_packages.yaml index 303877a..a77ab3c 100644 --- a/roles/repo-install-rpm/tasks/install_repo_packages.yaml +++ b/roles/repo-install-rpm/tasks/install_repo_packages.yaml @@ -12,7 +12,7 @@ become: yes - name: Get changes generated packages on {{ repo_name }} - shell: dnf -q --repo {{ repo_name }} repoquery {{ exclude }} --location 2> /dev/null | egrep -v ".src.rpm$" + shell: dnf -q --repo {{ repo_name }} repoquery {{ exclude }} --location 2> /dev/null | grep -E -v ".src.rpm$" register: repoquery vars: exclude: '{% for x in install_repo_exclude|default([]) %}--exclude "{{ x }}" {% endfor %}' diff --git a/roles/source-to-tarball/tasks/main.yaml b/roles/source-to-tarball/tasks/main.yaml index 0341488..74b621a 100644 --- a/roles/source-to-tarball/tasks/main.yaml +++ b/roles/source-to-tarball/tasks/main.yaml @@ -49,7 +49,7 @@ - block: - name: Detect version from specfile shell: > - rpmspec -P {{ package_name}}.spec 2> /dev/null | egrep -i '^version:' | + rpmspec -P {{ package_name}}.spec 2> /dev/null | grep -E -i '^version:' | sed -e "s/[Vv]ersion:[ \t]\+//g" register: cmd args: