diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ed5e94a..1c583b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,6 +52,7 @@ jobs: - name: Run tests run: | + PATH=$HOMEBREW_PREFIX/opt/coreutils/libexec/gnubin:$PATH bash --version git config --global user.email "user@example.com" git config --global user.name "User Name" diff --git a/libexec/basher-_link-bins b/libexec/basher-_link-bins index a4dedce..02aae7c 100755 --- a/libexec/basher-_link-bins +++ b/libexec/basher-_link-bins @@ -27,6 +27,6 @@ do name="${name%%.*}" fi mkdir -p "$BASHER_INSTALL_BIN" - ln -sf "$BASHER_PACKAGES_PATH/$package/$bin" "$BASHER_INSTALL_BIN/${name}" + ln -sf $(realpath -s --relative-to="$BASHER_INSTALL_BIN" "$BASHER_PACKAGES_PATH/$package/$bin") "$BASHER_INSTALL_BIN/${name}" chmod +x "$BASHER_INSTALL_BIN/${name}" done diff --git a/libexec/basher-_link-completions b/libexec/basher-_link-completions index 63f398a..cddb92c 100755 --- a/libexec/basher-_link-completions +++ b/libexec/basher-_link-completions @@ -15,7 +15,7 @@ IFS=: read -ra zsh_completions <<< "$ZSH_COMPLETIONS" for completion in "${bash_completions[@]}" do mkdir -p "$BASHER_PREFIX/completions/bash" - ln -sf "$BASHER_PACKAGES_PATH/$package/$completion" "$BASHER_PREFIX/completions/bash/${completion##*/}" + ln -sf $(realpath -s --relative-to="$BASHER_PREFIX/completions/bash" "$BASHER_PACKAGES_PATH/$package/$completion") "$BASHER_PREFIX/completions/bash/${completion##*/}" done for completion in "${zsh_completions[@]}" @@ -23,9 +23,9 @@ do target="$BASHER_PACKAGES_PATH/$package/$completion" if grep -q "#compdef" "$target"; then mkdir -p "$BASHER_PREFIX/completions/zsh/compsys" - ln -sf "$target" "$BASHER_PREFIX/completions/zsh/compsys/${completion##*/}" + ln -sf $(realpath -s --relative-to="$BASHER_PREFIX/completions/zsh/compsys" "$target") "$BASHER_PREFIX/completions/zsh/compsys/${completion##*/}" else mkdir -p "$BASHER_PREFIX/completions/zsh/compctl" - ln -sf "$target" "$BASHER_PREFIX/completions/zsh/compctl/${completion##*/}" + ln -sf $(realpath -s --relative-to="$BASHER_PREFIX/completions/zsh/compctl" "$target") "$BASHER_PREFIX/completions/zsh/compctl/${completion##*/}" fi done diff --git a/libexec/basher-_link-man b/libexec/basher-_link-man index 8ba1761..67590dd 100755 --- a/libexec/basher-_link-man +++ b/libexec/basher-_link-man @@ -16,6 +16,6 @@ do if [[ "$file" =~ $pattern ]]; then n="${BASH_REMATCH[1]}" mkdir -p "${BASHER_INSTALL_MAN}/man${n}" - ln -sf "$BASHER_PACKAGES_PATH/$package/man/$file" "$BASHER_INSTALL_MAN/man${n}/${file}" + ln -sf $(realpath -s --relative-to="$BASHER_INSTALL_MAN/man${n}" "$BASHER_PACKAGES_PATH/$package/man/$file") "$BASHER_INSTALL_MAN/man${n}/${file}" fi done