From c0d11f631f9c7473414fb7336d984b84908d5408 Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Thu, 8 Sep 2022 08:05:36 +0200 Subject: [PATCH] homebrew: add Linux brew path to defaults (#5241) (#5254) * homebrew: add Linux brew path to defaults * changelogs: add 5241 fragment * homebrew_tap: add Linux brew path to defaults * changelogs: update 5241 entry * homebrew_tap: format path separator in desc Co-authored-by: Felix Fontein Co-authored-by: Felix Fontein (cherry picked from commit be9acc7fbaba5dbc8be5c9019382891126d409ad) Co-authored-by: Dawid Dziurla --- changelogs/fragments/5241-homebrew-add-linux-path.yaml | 2 ++ plugins/modules/packaging/os/homebrew.py | 4 ++-- plugins/modules/packaging/os/homebrew_tap.py | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 changelogs/fragments/5241-homebrew-add-linux-path.yaml diff --git a/changelogs/fragments/5241-homebrew-add-linux-path.yaml b/changelogs/fragments/5241-homebrew-add-linux-path.yaml new file mode 100644 index 0000000000..3a954c6a4f --- /dev/null +++ b/changelogs/fragments/5241-homebrew-add-linux-path.yaml @@ -0,0 +1,2 @@ +minor_changes: + - homebrew, homebrew_tap - added Homebrew on Linux path to defaults (https://github.com/ansible-collections/community.general/pull/5241). diff --git a/plugins/modules/packaging/os/homebrew.py b/plugins/modules/packaging/os/homebrew.py index b5c6dbdc34..a72d929a81 100644 --- a/plugins/modules/packaging/os/homebrew.py +++ b/plugins/modules/packaging/os/homebrew.py @@ -39,7 +39,7 @@ options: - "A C(:) separated list of paths to search for C(brew) executable. Since a package (I(formula) in homebrew parlance) location is prefixed relative to the actual path of I(brew) command, providing an alternative I(brew) path enables managing different set of packages in an alternative location in the system." - default: '/usr/local/bin:/opt/homebrew/bin' + default: '/usr/local/bin:/opt/homebrew/bin:/home/linuxbrew/.linuxbrew/bin' type: path state: description: @@ -876,7 +876,7 @@ def main(): elements='str', ), path=dict( - default="/usr/local/bin:/opt/homebrew/bin", + default="/usr/local/bin:/opt/homebrew/bin:/home/linuxbrew/.linuxbrew/bin", required=False, type='path', ), diff --git a/plugins/modules/packaging/os/homebrew_tap.py b/plugins/modules/packaging/os/homebrew_tap.py index bbba2d9f6d..0cc5b23ce8 100644 --- a/plugins/modules/packaging/os/homebrew_tap.py +++ b/plugins/modules/packaging/os/homebrew_tap.py @@ -48,8 +48,8 @@ options: type: str path: description: - - "A ':' separated list of paths to search for C(brew) executable." - default: '/usr/local/bin:/opt/homebrew/bin' + - "A C(:) separated list of paths to search for C(brew) executable." + default: '/usr/local/bin:/opt/homebrew/bin:/home/linuxbrew/.linuxbrew/bin' type: path version_added: '2.1.0' requirements: [ homebrew ] @@ -219,7 +219,7 @@ def main(): url=dict(default=None, required=False), state=dict(default='present', choices=['present', 'absent']), path=dict( - default="/usr/local/bin:/opt/homebrew/bin", + default="/usr/local/bin:/opt/homebrew/bin:/home/linuxbrew/.linuxbrew/bin", required=False, type='path', ),