Adding check_binaries command that is distinct from check_packages to lib/common.sh

anago

@@ -342,8 +342,8 @@ check_prerequisites () {
   # We check for docker here as a word which passes for docker-ce and
   # docker-engine as docker packages are in transiation of deprecating
   # docker-engine
-  common::check_packages jq pandoc docker ${PREREQUISITE_PACKAGES[*]} \
-   || return 1
+  common::check_binaries jq pandoc docker || return 1
+  common::check_packages ${PREREQUISITE_PACKAGES[*]} || return 1
   common::check_pip_packages yq || return 1
 
   security_layer::auth_check 2 || return 1

branchff

@@ -58,10 +58,7 @@ source $(dirname $(readlink -ne $BASH_SOURCE))/lib/common.sh
 
 # Check prerequisites
 
-PREREQUISITE_TOOLS=("git" "jq" "go" "make")
-for PREREQ in ${PREREQUISITE_TOOLS[@]}; do
-  command -v $PREREQ > /dev/null 2>&1 || common::exit 1 "$PREREQ not installed"
-done;
+common::check_binaries git go jq make
 
 [[ -w /usr/local ]] || common::exit 1 "/usr/local is not writable."
 

find_green_build

@@ -101,7 +101,7 @@ MYLOG=$TMPDIR/$PROG.log
 common::logfileinit $MYLOG 10
 
 gitlib::github_api_token
-common::check_packages jq
+common::check_binaries jq
 common::check_pip_packages yq
 common::set_cloud_binaries
 

gcbmgr

@@ -372,7 +372,7 @@ common::logfileinit $MYLOG 10
 # BEGIN script
 common::timestamp begin
 
-common::check_packages jq git bsdmainutils || common::exit 1 "Exiting..."
+common::check_binaries jq git column || common::exit 1 "Exiting..."
 gitlib::repo_state || common::exit 1 "Exiting..."
 
 # Ensure some prerequisites

lib/common.sh

@@ -737,6 +737,54 @@ common::check_pip_packages () {
   logecho -r "$OK"
 }
 
+##############################################################################
+# Check whether required binaries are installed
+
+common::check_binaries () {
+  local distro
+  local prereq
+
+  # Make sure a bunch of binaries are installed
+  logecho -n "Checking whether required binaries are available...\n"
+
+  for prereq in $*; do
+    which $prereq > /dev/null || missing+=($prereq)
+  done
+
+  if ((${#missing[@]}>0)); then
+    if ((FLAGS_gcb)); then
+      # Just force Ubuntu
+      distro="Ubuntu"
+    else
+      distro=$(lsb_release -si)
+    fi
+    logecho -r "$FAILED"
+    logecho "PREREQ: Missing prerequisites: ${missing[@]}"
+
+    case $distro in
+      Fedora)
+        logecho "Run the following command(s) to find the package(s) that contain(s) the required prerequisite(s):"
+        for prereq in ${missing[@]}; do
+          logecho "dnf provides $prereq"
+        done
+        return 1
+        ;;
+      Ubuntu|LinuxMint|Debian)
+        logecho "Run the following command(s) to find the package(s) that contain(s) the required prerequisite(s):"
+        for prereq in ${missing[@]}; do
+          logecho "dpkg -S $prereq"
+        done
+        return 1
+        ;;
+      *)
+        logecho "Unsupported distribution. Please consult your distribution's documentation for downloading the missing prerequisite(s)"
+        return 1
+        ;;
+    esac
+    return 1
+  fi
+  logecho -r "$OK"
+}
 
 ###############################################################################
 # Check packages for a K8s release

relnotes

@@ -511,7 +511,7 @@ common::timestamp begin
 gitlib::github_api_token
 
 # Check for packages
-common::check_packages jq pandoc
+common::check_binaries jq pandoc
 
 # Build LAST_RELEASE dictionary
 gitlib::last_releases

script-template

@@ -149,6 +149,7 @@ common::timestamp begin
 # common::askyorn - Ask a simple yes or no question (see common.sh for details)
 # common::stepheader - Bolded, logged bullet points for your output
 # common::exit - Exit cleanly
+# common::check_binaries - Checks for binary prereqs
 # common::check_packages - Check for package prereqs
 # common::disk_space_check - Check disk space