Move global variables to new vars.sh module

src/make.skel → src/include/vars.sh.skel

@@ -1,19 +1,7 @@
 #!/bin/bash
-#shellcheck disable=SC2034
 # mkit - simple install helper
 # See LICENSE file for copyright and license details.
 
-init_core() {
-    #
-    # Load core module (or die)
-    #
-    #shellcheck disable=SC1090
-    . "$MKIT_DIR/include/mkit.sh" \
-     && return 0
-    echo "failed to load core; check if MKIT_DIR is set properly: $MKIT_DIR" >&2
-    exit 9
-}
-
 
 #
 # Bump size (for vbump_? and release_?)
@@ -30,11 +18,6 @@ MKIT_DEBUG=${MKIT_DEBUG:-false}
 #
 MKIT_DEFAULT_MODE="644"
 
-#
-# Path to MKit dir (where 'include' is)
-#
-MKIT_DIR=${MKIT_DIR:-$(dirname "$0")}
-
 #
 # Dry mode (true|false)
 #
@@ -75,16 +58,3 @@ MKIT_PROJ_PKGNAME=""
 # This MKit version
 #
 MKIT_VERSION=__MKIT_PROJ_VERSION__
-
-
-init_core
-
-case "$1" in
-    --version-semver) echo "$MKIT_VERSION"; exit 0 ;;
-    --version)        echo "Mkit (Simple Makefile target helper) $MKIT_VERSION"
-                      exit 0 ;;
-esac
-
-mkit_init
-
-route "$@"

src/make

@@ -0,0 +1,34 @@
+#!/bin/bash
+#shellcheck disable=SC2034
+# mkit - simple install helper
+# See LICENSE file for copyright and license details.
+
+init_core() {
+    #
+    # Load core module (or die)
+    #
+    #shellcheck disable=SC1090
+    . "$MKIT_DIR/include/mkit.sh" \
+     && . "$MKIT_DIR/include/vars.sh" \
+     && return 0
+    echo "failed to load core; check if MKIT_DIR is set properly: $MKIT_DIR" >&2
+    exit 9
+}
+
+#
+# Path to MKit dir (where 'include' is)
+#
+MKIT_DIR=${MKIT_DIR:-$(dirname "$0")}
+
+
+init_core
+
+case "$1" in
+    --version-semver) echo "$MKIT_VERSION"; exit 0 ;;
+    --version)        echo "Mkit (Simple Makefile target helper) $MKIT_VERSION"
+                      exit 0 ;;
+esac
+
+mkit_init
+
+route "$@"