feat: move v2 tool tests to new test function

Author: viceice

src/usr/local/containerbase/tools/v2/elixir.sh

@@ -67,8 +67,8 @@ function link_tool () {
   shell_wrapper "${TOOL_NAME}" "${versioned_tool_path}/bin"
   shell_wrapper mix "${versioned_tool_path}/bin"
 
-  [[ -n $SKIP_VERSION ]] || elixir --version
-  [[ -n $SKIP_VERSION ]] || mix --version
+  elixir --version
+  mix --version
 
   if [[ $(is_root) -eq 0 ]]; then
     su -c 'mix local.hex --force' "${USER_NAME}"

src/usr/local/containerbase/tools/v2/erlang.sh

@@ -97,5 +97,5 @@ function link_tool () {
   # only works for v24+
   #export_tool_env ERL_ROOTDIR "${versioned_tool_path}"
   shell_wrapper erl "${versioned_tool_path}/bin"
-  [[ -n $SKIP_VERSION ]] || erl -eval 'erlang:display(erlang:system_info(otp_release)), halt().' -noshell
+  erl -eval 'erlang:display(erlang:system_info(otp_release)), halt().' -noshell
 }

src/usr/local/containerbase/tools/v2/git-lfs.sh

@@ -35,7 +35,7 @@ function install_tool () {
 function link_tool () {
   shell_wrapper "${TOOL_NAME}" "$(find_versioned_tool_path)/bin"
 
-  [[ -n $SKIP_VERSION ]] || git lfs version
+  git lfs version
 
   if [ "$(is_root)" -eq 0 ]; then
     git lfs install --system

src/usr/local/containerbase/tools/v2/golang.sh

@@ -100,7 +100,9 @@ function link_tool () {
   versioned_tool_path=$(find_versioned_tool_path)
 
   shell_wrapper go "${versioned_tool_path}/bin" "GOBIN=\${GOBIN-${BIN_DIR}}"
+}
 
-  [[ -n $SKIP_VERSION ]] || go version
-  [[ -n $SKIP_VERSION ]] || go env
+function test_tool () {
+  go version
+  go env
 }

src/usr/local/containerbase/tools/v2/jb.sh

@@ -21,5 +21,8 @@ function link_tool () {
   versioned_tool_path=$(find_versioned_tool_path)
 
   shell_wrapper "${TOOL_NAME}" "${versioned_tool_path}/bin"
-  [[ -n $SKIP_VERSION ]] || jb --version
+}
+
+function test_tool () {
+  jb --version
 }

src/usr/local/containerbase/tools/v2/nix.sh

@@ -36,5 +36,8 @@ function link_tool() {
   versioned_tool_path=$(find_versioned_tool_path)
 
   shell_wrapper "${TOOL_NAME}" "${versioned_tool_path}/bin" "NIX_STORE_DIR=$(get_cache_path)/nix/store NIX_DATA_DIR=$(get_cache_path)/nix/data NIX_LOG_DIR=$(get_cache_path)/nix/log NIX_STATE_DIR=$(get_cache_path)/nix/state NIX_CONF_DIR=$(get_cache_path)/nix/conf"
-  [[ -n $SKIP_VERSION ]] || nix --version
+}
+
+function test_tool () {
+  nix --version
 }

src/usr/local/containerbase/tools/v2/powershell.sh

@@ -38,5 +38,8 @@ function install_tool () {
 
 function link_tool () {
   shell_wrapper pwsh "$(find_versioned_tool_path)"
-  [[ -n $SKIP_VERSION ]] || pwsh -version
+}
+
+function test_tool () {
+  pwsh -version
 }

src/usr/local/containerbase/tools/v2/python.sh

@@ -126,7 +126,9 @@ function link_tool () {
   shell_wrapper pip "${versioned_tool_path}/bin"
   shell_wrapper "pip${MAJOR}" "${versioned_tool_path}/bin"
   shell_wrapper "pip${MAJOR}.${MINOR}" "${versioned_tool_path}/bin"
+}
 
-  [[ -n $SKIP_VERSION ]] || python --version
-  [[ -n $SKIP_VERSION ]] || PYTHONWARNINGS=ignore pip --version
+function test_tool () {
+  python --version
+  PYTHONWARNINGS=ignore pip --version
 }

src/usr/local/containerbase/tools/v2/ruby.sh

@@ -138,8 +138,10 @@ function link_tool () {
 
   shell_wrapper ruby "${versioned_tool_path}/bin"
   shell_wrapper gem "${versioned_tool_path}/bin"
+}
 
-  [[ -n $SKIP_VERSION ]] || ruby --version
-  [[ -n $SKIP_VERSION ]] || echo "gem $(gem --version)"
-  [[ -n $SKIP_VERSION ]] || gem env
+function test_tool () {
+  ruby --version
+  echo "gem $(gem --version)"
+  gem env
 }

src/usr/local/containerbase/tools/v2/rust.sh

@@ -74,7 +74,9 @@ function link_tool () {
 
   shell_wrapper "cargo" "${versioned_tool_path}/bin"
   shell_wrapper "rustc" "${versioned_tool_path}/bin"
+}
 
-  [[ -n $SKIP_VERSION ]] || cargo --version
-  [[ -n $SKIP_VERSION ]] || rustc --version
+function test_tool () {
+  cargo --version
+  rustc --version
 }