Remove s2i_core_env_init_hook

s2i-core-hooks only defined one function, s2i_core_env_init_hook

This was only called by s2i_core_env_init in s2i-core (it overrides
an empty definition of the same function name in s2i-core)

Fold the content of the function into s2i_core_env_init and remove
the s2i-core-hooks file

Remove includes of it from s2i/assemble and run (which didn't call
the function anyway)

Signed-off-by: Jonathan Dowland <[email protected]>

Author: jmtd

modules/s2i/artifacts/opt/jboss/container/java/s2i/s2i-core

@@ -19,8 +19,8 @@ function s2i_core_init() {
 }
 
 function s2i_core_env_init() {
-  # initialize core s2i environmet variables
-  s2i_core_env_init_hook
+  # initialize core s2i environment variables
+  S2I_TARGET_DATA_DIR="${S2I_TARGET_DATA_DIR:-${JAVA_DATA_DIR:-/deployments/data}}"
   S2I_DESTINATION_DIR="${S2I_DESTINATION_DIR:-/tmp}"
   S2I_ARTIFACTS_DIR="${S2I_DESTINATION_DIR}/artifacts"
   S2I_SOURCE_DIR="${S2I_DESTINATION_DIR}/src"
@@ -35,12 +35,6 @@ function s2i_core_env_init() {
   S2I_DELETE_SOURCE="${S2I_DELETE_SOURCE:-true}"
 }
 
-# extensions may override this method to initialize environment variables
-# to suit their own needs.
-function s2i_core_env_init_hook() {
-  : 
-}
-
 # Copy files from a source path to a destination path
 # Do not attempt to change metadata of the destination path, which we
 # may not own

modules/s2i/artifacts/opt/jboss/container/java/s2i/s2i-core-hooks

@@ -5,9 +5,6 @@ set -e
 source "${JBOSS_CONTAINER_UTIL_LOGGING_MODULE}/logging.sh"
 source "${JBOSS_CONTAINER_MAVEN_S2I_MODULE}/maven-s2i"
 
-# include our s2i_core_*() overrides/extensions
-source "${JBOSS_CONTAINER_JAVA_S2I_MODULE}/s2i-core-hooks"
-
 # inject our overridden maven_s2i_*() functions
 source "${JBOSS_CONTAINER_JAVA_S2I_MODULE}/maven-s2i-overrides"
 

modules/s2i/artifacts/usr/libexec/s2i/assemble

@@ -4,9 +4,7 @@
 args="$*"
 
 source "${JBOSS_CONTAINER_UTIL_LOGGING_MODULE}/logging.sh"
-source "$JBOSS_CONTAINER_JAVA_S2I_MODULE}/s2i-core"
-# include our s2i_core_*() overrides/extensions
-source "${JBOSS_CONTAINER_JAVA_S2I_MODULE}/s2i-core-hooks"
+source "${JBOSS_CONTAINER_JAVA_S2I_MODULE}/s2i-core"
 
 # Global S2I variable setup
 s2i_core_env_init