commit aacb97fee15539af9b613e3df006fad2e5366e3c
author iilyak <iilyak@ca.ibm.com> Wed Aug 08 05:43:21 2018 -0700
committer GitHub <noreply@github.com> Wed Aug 08 05:43:21 2018 -0700
tree b76075b18f78090b36e05970009209930901c651
parent c12bb571579f7e335b84b1d98a1b90133b032b87
parent 172bdb890f4467dc37f75603e06f5343a22b1f85

Merge pull request #6 from cloudant/extra-dependencies

Allow execution of custom scripts to install packages

.gitignore

diff --git a/.gitignore b/.gitignore
index 1890956..fddae4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 *.tar.*
 couch
 js
+bin/extra

bin/install-dependencies.sh

diff --git a/bin/install-dependencies.sh b/bin/install-dependencies.sh
index aad0e64..01f7e6a 100755
--- a/bin/install-dependencies.sh
+++ b/bin/install-dependencies.sh
@@ -37,6 +37,9 @@
 # otherwise, see https://stackoverflow.com/questions/59895/
 SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
+# The directory when developers could put their own scripts which would be run
+EXTRA_SCRIPTS_DIR=${SCRIPTPATH}/extra
+
 # install JS by default, unless told otherwise (make-js images)
 if [[ $1 == "nojs" ]]; then
   JSINSTALL="nojs"
@@ -55,6 +58,21 @@
   exit 1
 fi
 
+# Unfortunately run-parts is not available in centos 6.
+# Therefore need to roll our own
+function run_scripts() {
+  local scripts_dir="$1"
+  local prefix="$2"
+  if [[ -d ${scripts_dir%/} ]]; then
+    scripts=$(LC_ALL=C; echo ${scripts_dir%/}/${prefix}*[^~,] | xargs -n 1 | sort -n)
+    for script in $scripts ; do
+        echo "Running ${script}" >&2
+        ! ([[ -f ${script} && -x ${script} ]] && ${script}) \
+            && echo "Failure in ${script}" >&2 && exit 1
+    done
+  fi
+}
+
 # TODO: help info on -h
 
 . ${SCRIPTPATH}/detect-os.sh
@@ -70,12 +88,14 @@
       if [[ ! ${SKIPERLANG} ]]; then
         ERLANGVERSION=${ERLANGVERSION} ${SCRIPTPATH}/yum-erlang.sh
       fi
+      run_scripts ${EXTRA_SCRIPTS_DIR} 'yum-'
     elif [[ ${ID} =~ ${debians} ]]; then
       NODEVERSION=${NODEVERSION} ERLANGVERSION=${ERLANGVERSION} \
           ${SCRIPTPATH}/apt-dependencies.sh ${JSINSTALL}
       if [[ ! ${SKIPERLANG} ]]; then
         ERLANGVERSION=${ERLANGVERSION} ${SCRIPTPATH}/apt-erlang.sh
       fi
+      run_scripts ${EXTRA_SCRIPTS_DIR} 'apt-'
     else
       echo "Sorry, we don't support this Linux (${ID}) yet."
       exit 1
@@ -89,6 +109,7 @@
           ${SCRIPTPATH}/pkg-dependencies.sh ${JSINSTALL}
     if [[ ! ${SKIPERLANG} ]]; then
       ERLANGVERSION=${ERLANGVERSION} ${SCRIPTPATH}/pkg-erlang.sh
+      run_scripts ${EXTRA_SCRIPTS_DIR} 'pkg-'
     fi
     ;;
   bsd*)