Adding support for homebrew tap url

emilhdiaz · Oct 21, 2020 · 40fdd0c · 40fdd0c
1 parent 7c387fe
commit 40fdd0c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/libexec/install.sh b/libexec/install.sh
@@ -67,6 +67,7 @@ install_packages_from_config() {
     local INSTALLER=${INSTALLER:-$(get_default_os_package_manager)}
     local VERSION=$(yq r "${CONFIG}" "packages[$_i].version")
     local TAP=$(yq r "${CONFIG}" "packages[$_i].tap")
+    local TAP_URL=$(yq r "${CONFIG}" "packages[$_i].tap-url")
 
     log_info "Found package ${YELLOW}${INSTALLER}:${PACKAGE}@${VERSION}${NC} in configuration file"
 
@@ -77,7 +78,9 @@ install_packages_from_config() {
       install_or_upgrade_package "$(get_default_os_package_manager)" "${REQUIRED_PACKAGE}"
     done
 
-    install_or_upgrade_package "${INSTALLER}" "${PACKAGE}" "${VERSION}" $([ -n "${TAP}" ] && echo "--tap ${TAP}")
+    install_or_upgrade_package "${INSTALLER}" "${PACKAGE}" "${VERSION}" \
+      $([ -n "${TAP}" ] && echo "--tap ${TAP}") \
+      $([ -n "${TAP_URL}" ] && echo "--tap-url ${TAP_URL}")
     echo "\n"
   done
 }

diff --git a/libexec/installers/brew.sh b/libexec/installers/brew.sh
@@ -42,14 +42,15 @@ brew_install_or_upgrade_package() {
 
   local PROGRAM=$1 && shift
   local TAP=$(parse_long_opt 'tap' '' "$@")
+  local TAP_URL=$(parse_long_opt 'tap-url' '' "$@")
   local DESIRED_FORMULA=${1:-latest}
   local CURRENT_VERSION=$(brew_get_current_version "${PROGRAM}")
   local DESIRED_VERSION=${CURRENT_VERSION}
 
   # check if we need to register plugin
   if [ -n "${TAP}" ] &&  ! (brew tap | grep "${TAP}" > /dev/null 2>&1); then
     log_info "ℹ️️  Installing homebrew tap ${TAP}..."
-    brew tap "${TAP}"
+    brew tap "${TAP}" "${TAP_URL}"
   fi
 
   # resolve "latest" version

diff --git a/libexec/installers/darwin.sh b/libexec/installers/darwin.sh
@@ -73,6 +73,7 @@ install_or_upgrade_package() {
   local PROGRAM=$1 && shift
   local VERSION=${1:-}
   local TAP=$(parse_long_opt 'tap' '' "$@")
+  local TAP_URL=$(parse_long_opt 'tap-url' '' "$@")
 
   if [ -n "${DRY_RUN}" ]; then
     return
@@ -87,7 +88,9 @@ install_or_upgrade_package() {
 
   # install via brew
   elif [[ "$INSTALLER" == "brew" ]]; then
-    brew_install_or_upgrade_package "${PROGRAM}" "${VERSION}" $([ -n "${TAP}" ] && echo "--tap ${TAP}")
+    brew_install_or_upgrade_package "${PROGRAM}" "${VERSION}" \
+      $([ -n "${TAP}" ] && echo "--tap ${TAP}") \
+      $([ -n "${TAP_URL}" ] && echo "--tap-url ${TAP_URL}")
 
   # install via asdf
   elif [[ "$INSTALLER" == "asdf" ]]; then