Merge pull request #376 from continuouspipe/feature/bootstrap-in-one-file

Move all function bootstrap to a single file

Author: kierenevans

ubuntu/16.04/usr/local/bin/container

@@ -4,24 +4,7 @@ set -e
 TASK=$1
 ARGS=( "$@" )
 
-# Initialisation - Declare variables and run pre-templating steps.
-source /usr/local/share/bootstrap/setup.sh
-
-# Initialisation - Runtime installation tasks
-shopt -s nullglob
-set -- /usr/local/share/container/baseimage-*
-if [ "$#" -gt 0 ]; then
-  for file in "$@"; do
-    # shellcheck source=/dev/null
-    source "${file}"
-  done
-fi
-
-source /usr/local/share/container/plan.sh
-if [ -e "$WORK_DIRECTORY/plan.sh" ]; then
-  # shellcheck source=/dev/null
-  source "$WORK_DIRECTORY/plan.sh"
-fi
+source /usr/local/share/bootstrap/bootstrap.sh
 
 set -x
 

ubuntu/16.04/usr/local/share/bootstrap/bootstrap.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Initialisation - Declare variables and run pre-templating steps.
+source /usr/local/share/bootstrap/setup.sh
+
+# Initialisation - Runtime installation tasks
+shopt -s nullglob
+set -- /usr/local/share/container/baseimage-*
+if [ "$#" -gt 0 ]; then
+  for file in "$@"; do
+    # shellcheck source=/dev/null
+    source "${file}"
+  done
+fi
+
+source /usr/local/share/container/plan.sh
+if [ -e "$WORK_DIRECTORY/plan.sh" ]; then
+  # shellcheck source=/dev/null
+  source "$WORK_DIRECTORY/plan.sh"
+fi