Skip to content

Commit

Permalink
Use internal function for cellar linkage
Browse files Browse the repository at this point in the history
  • Loading branch information
mjsteinbaugh committed Sep 18, 2019
1 parent b5648d9 commit 71a4f57
Show file tree
Hide file tree
Showing 19 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion os/linux/bin/install-cellar-genrich
Expand Up @@ -31,7 +31,7 @@ exe_file="${prefix}/bin/${name}"
rm -rf "$tmp_dir"
)

link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"

command -v "$exe_file"
"$exe_file" --version
2 changes: 1 addition & 1 deletion os/linux/bin/install-cellar-rmate
Expand Up @@ -26,7 +26,7 @@ exe_file="${prefix}/bin/${name}"
cp rmate "${prefix}/bin"
)

link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"

command -v "$exe_file"
"$exe_file" --version
2 changes: 1 addition & 1 deletion os/linux/bin/install-cellar-shellcheck
Expand Up @@ -32,7 +32,7 @@ printf "Installing %s %s.\n" "$name" "$version"
rm -fr "$tmp_dir"
)

link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"

command -v "$exe_file"
"$exe_file" --version
2 changes: 1 addition & 1 deletion system/include/cellar/bash.sh
Expand Up @@ -35,7 +35,7 @@ printf "Installing %s %s.\n" "$name" "$version"
rm -fr "$tmp_dir"
)

link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"
_koopa_update_shells "$name"

"$exe_file" --version
Expand Down
2 changes: 1 addition & 1 deletion system/include/cellar/coreutils.sh
Expand Up @@ -34,7 +34,7 @@ printf "Installing %s %s.\n" "$name" "$version"
rm -fr "$tmp_dir"
)

link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"

# Update '/usr/bin/env'.
if _koopa_has_sudo
Expand Down
2 changes: 1 addition & 1 deletion system/include/cellar/emacs.sh
Expand Up @@ -34,7 +34,7 @@ printf "Installing %s %s.\n" "$name" "$version"
rm -fr "$tmp_dir"
)

link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"

command -v "$exe_file"
"$exe_file" --version
2 changes: 1 addition & 1 deletion system/include/cellar/gdal.sh
Expand Up @@ -52,7 +52,7 @@ printf "Installing %s %s.\n" "$name" "$version"
rm -fr "$tmp_dir"
)

link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"

"$exe_file" --version
command -v "$exe_file"
2 changes: 1 addition & 1 deletion system/include/cellar/git.sh
Expand Up @@ -49,7 +49,7 @@ printf "Installing %s %s.\n" "$name" "$version"
rm -fr "$tmp_dir"
)

link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"

"$exe_file" --version
command -v "$exe_file"
14 changes: 7 additions & 7 deletions system/include/cellar/gnupg.sh
Expand Up @@ -47,7 +47,7 @@ mkdir -pv "$tmp_dir"
make install
)

link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"

(
pkg="libgcrypt"
Expand All @@ -63,7 +63,7 @@ link-cellar "$name" "$version"
make install
)

link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"

(
pkg="libassuan"
Expand All @@ -79,7 +79,7 @@ link-cellar "$name" "$version"
make install
)

link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"

(
pkg="libksba"
Expand All @@ -95,7 +95,7 @@ link-cellar "$name" "$version"
make install
)

link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"

(
pkg="npth"
Expand All @@ -111,7 +111,7 @@ link-cellar "$name" "$version"
make install
)

link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"

(
pkg="pinentry"
Expand All @@ -127,7 +127,7 @@ link-cellar "$name" "$version"
make install
)

link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"

(
pkg="gnupg"
Expand All @@ -144,7 +144,7 @@ link-cellar "$name" "$version"
make install
)

link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"

rm -rf "$tmp_dir"

Expand Down
2 changes: 1 addition & 1 deletion system/include/cellar/gsl.sh
Expand Up @@ -34,7 +34,7 @@ printf "Installing %s %s.\n" "$name" "$version"
rm -fr "$tmp_dir"
)

link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"

command -v "$exe_file"
"$exe_file" --version
2 changes: 1 addition & 1 deletion system/include/cellar/hdf5.sh
Expand Up @@ -43,7 +43,7 @@ printf "Installing %s %s.\n" "$name" "$version"
rm -fr "$tmp_dir"
)

link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"

command -v "$exe_file"
"$exe_file" -showconfig
2 changes: 1 addition & 1 deletion system/include/cellar/htop.sh
Expand Up @@ -36,7 +36,7 @@ printf "Installing %s %s.\n" "$name" "$version"
rm -fr "$tmp_dir"
)

link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"

command -v "$exe_file"
"$exe_file" --version
2 changes: 1 addition & 1 deletion system/include/cellar/neovim.sh
Expand Up @@ -45,6 +45,6 @@ printf "Installing %s %s.\n" "$name" "$version"
rm -fr "$tmp_dir"
)

link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"
"$exe_file" --version
command -v "$exe_file"
2 changes: 1 addition & 1 deletion system/include/cellar/proj.sh
Expand Up @@ -36,7 +36,7 @@ printf "Installing %s %s.\n" "$name" "$version"
rm -fr "$tmp_dir"
)

link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"

"$exe_file"
command -v "$exe_file"
2 changes: 1 addition & 1 deletion system/include/cellar/python.sh
Expand Up @@ -38,7 +38,7 @@ printf "Installing %s %s.\n" "$name" "$version"
rm -fr "$tmp_dir"
)

link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"

# Symlink python3 to python.
build_prefix="$(_koopa_build_prefix)"
Expand Down
4 changes: 2 additions & 2 deletions system/include/cellar/r.sh
Expand Up @@ -59,12 +59,12 @@ printf "Installing %s %s.\n" "$name" "$version"
)

# We need to run this first to pick up R_HOME correctly.
link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"

_koopa_update_r_config

# Run again to ensure R site config files propagate correctly.
link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"

command -v "$exe_file"
"$exe_file" --version
2 changes: 1 addition & 1 deletion system/include/cellar/tmux.sh
Expand Up @@ -33,7 +33,7 @@ printf "Installing %s %s.\n" "$name" "$version"
rm -fr "$tmp_dir"
)

link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"

"$exe_file" -V
command -v "$exe_file"
2 changes: 1 addition & 1 deletion system/include/cellar/vim.sh
Expand Up @@ -45,7 +45,7 @@ printf "Installing %s %s.\n" "$name" "$version"
rm -fr "$tmp_dir"
)

link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"

"$exe_file" --version
command -v "$exe_file"
2 changes: 1 addition & 1 deletion system/include/cellar/zsh.sh
Expand Up @@ -37,7 +37,7 @@ printf "Installing %s %s.\n" "$name" "$version"
rm -fr "$tmp_dir"
)

link-cellar "$name" "$version"
_koopa_link_cellar "$name" "$version"
_koopa_update_shells "$name"

command -v "$exe_file"
Expand Down

0 comments on commit 71a4f57

Please sign in to comment.