From dc23eb21e30c50c2e15f9314cdd7d6e22318ae25 Mon Sep 17 00:00:00 2001 From: Charith Amarasinghe <995136+char8@users.noreply.github.com> Date: Sun, 29 Mar 2020 20:49:35 +0100 Subject: [PATCH] Fix missing dependency on helper module for helpers added in #1793 (#1811) PR #1793 introduced helper functions for OS detection in some modules. These helpers require a module dependency on the 'helper' module. --- modules/haskell/init.zsh | 3 +++ modules/macports/init.zsh | 3 +++ modules/osx/init.zsh | 3 +++ modules/perl/init.zsh | 3 +++ modules/python/init.zsh | 3 +++ modules/rsync/init.zsh | 3 +++ 6 files changed, 18 insertions(+) diff --git a/modules/haskell/init.zsh b/modules/haskell/init.zsh index 7863528..cb76864 100644 --- a/modules/haskell/init.zsh +++ b/modules/haskell/init.zsh @@ -10,6 +10,9 @@ if (( ! $+commands[ghc] )); then return 1 fi +# Load dependencies. +pmodload 'helper' + # Prepend Cabal per user directories to PATH. if is-darwin && [[ -d $HOME/Library/Haskell ]]; then path=($HOME/Library/Haskell/bin(/N) $path) diff --git a/modules/macports/init.zsh b/modules/macports/init.zsh index 943ff5b..7bf4ab2 100644 --- a/modules/macports/init.zsh +++ b/modules/macports/init.zsh @@ -6,6 +6,9 @@ # Sorin Ionescu # +# Load dependencies. +pmodload 'helper' + # Return if requirements are not found. if ! is-darwin; then return 1 diff --git a/modules/osx/init.zsh b/modules/osx/init.zsh index 2b74d3a..62f2194 100644 --- a/modules/osx/init.zsh +++ b/modules/osx/init.zsh @@ -5,6 +5,9 @@ # Sorin Ionescu # +# Load dependencies. +pmodload 'helper' + # Return if requirements are not found. if ! is-darwin; then return 1 diff --git a/modules/perl/init.zsh b/modules/perl/init.zsh index 50e9b64..8f097f6 100644 --- a/modules/perl/init.zsh +++ b/modules/perl/init.zsh @@ -10,6 +10,9 @@ if (( ! $+commands[perl] )); then return 1 fi +# Load dependencies. +pmodload 'helper' + # # Load Perlbrew or plenv # diff --git a/modules/python/init.zsh b/modules/python/init.zsh index a7e8b6e..809ab40 100644 --- a/modules/python/init.zsh +++ b/modules/python/init.zsh @@ -7,6 +7,9 @@ # Patrick Bos # +# Load dependencies +pmodload 'helper' + # Load manually installed pyenv into the path if [[ -s "${PYENV_ROOT:=$HOME/.pyenv}/bin/pyenv" ]]; then path=("${PYENV_ROOT}/bin" $path) diff --git a/modules/rsync/init.zsh b/modules/rsync/init.zsh index f2eb891..79432c1 100644 --- a/modules/rsync/init.zsh +++ b/modules/rsync/init.zsh @@ -10,6 +10,9 @@ if (( ! $+commands[rsync] )); then return 1 fi +# Load dependencies. +pmodload 'helper' + # # Aliases #