Fix load_config to allow it to read from stdin

shtdlib.sh

@@ -1381,10 +1381,15 @@ EOF
 # This is mostly irrelevant when running in strict mode
 function required_argument {
     print_usage_function="${3:-print_usage}"
-    if [ -z "${!1}" ]; then
-        ${print_usage_function}
-        color_echo red "${2}"
-        exit 255
+    if [ -n "${1:-}" ]; then
+        debug 10 "Processing required argument: ${1}"
+        if [ -z "${!1}" ]; then
+            ${print_usage_function}
+            color_echo red "${2}"
+            exit 255
+        else
+            debug 10 "Argument: ${1} set to: ${!1}"
+        fi
     fi
 }
 
@@ -2206,7 +2211,7 @@ function create_relative_archive {
     done
 
     # shellcheck disable=SC2068
-    tar ${transformations[@]} "${verbose_flag}" "--${archive_operation}" --exclude-vcs --directory "${run_dir}" --file "${archive_path}" ${source_elements[@]} || exit_on_fail
+    tar ${transformations[@]} ${verbose_flag} --${archive_operation} --exclude-vcs --directory "${run_dir}" --file "${archive_path}" ${source_elements[@]} || exit_on_fail
 }
 
 # Given a filename it will sign the file with the default key
@@ -2249,6 +2254,7 @@ function get_git_status {
 
 # Reads bash files and inlines any "source" references to a new file
 # If second parameter is empty or "-" the new file is printed to stdout
+# Explicit inlines can be defined using "#inline_source path_to_file"
 declare -a processed_inline_sources=()
 function inline_bash_source {
     local inline_source_file="${1}"
@@ -2263,7 +2269,13 @@ function inline_bash_source {
     local i
     for (( i=1; i<lines+1; i++ )) ; do
         local filename
-        filename="$(echo "${source_file_array[${i}-1]}" | grep '^source ' | awk '{print $2}')"
+        filename="$(echo "${source_file_array[${i}-1]}" | grep -e '^source ' -e '^import ' -e '^import_lib' -e '^#inline_source ' | awk '{print $2}')"
+        debug 10 "Processing source file: ${filename}"
+        interpolated_filename="$(echo ${filename//\"} | envsubst)"
+        if [ "${filename}" != "${interpolated_filename}" ] ; then
+            color_echo red "Warning, environment variable found in source/import statement '${filename}', note that variable(s) need to be set/populated when inlining the source, cautiosly proceeding"
+            filename="${interpolated_filename}"
+        fi
         if [ "${filename}" != "" ] ; then
             debug 10 "Found line with source instruction to file: ${filename}"
             local relative_filename
@@ -2526,26 +2538,47 @@ function associate_array {
     done
 }
 
-# Safely loads config file
+# Safely loads config file or config from stdin
 # First parameter is filename, all consequent parameters are assumed to be
 # valid configuration parameters
+# By default settings are printed when config is piped since variables set
+# would only live in a subshell, this can be changed using the "print_settings"
+# variable
 function load_config {
-    config_file="${1}"
-    # Verify config file permissions are correct and warn if they aren't
-    # Dual stat commands to work with both linux and bsd
-    while read -r line; do
+    # If first argument is a filename read it and pass it to the function
+    if [ -f "${1:-}" ]; then
+        print_settings='false'
+        load_config "${@:2}" < "${1}"
+        return
+    elif [ -t 0 ] ; then
+        color_echo red "No config filename provided or data on stdin, exiting"
+        return 1
+    else
+        print_settings="${print_settings:-true}"
+    fi
+
+    # First command needs to be read, this way any piped input goes to it
+    readarray config_file
+    for line in "${config_file[@]}"; do
         if [[ "${line}" =~ ^[^#]*= ]]; then
-            setting_name="$(echo "${line}" | awk -F '=' '{print $1}' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
+            setting_name="$(echo "${line}" | cut -f 1 -d '=' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
             setting_value="$(echo "${line}" | cut -f 2 -d '=' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
 
-            for requested_setting in "${@:2}" ; do
+            for requested_setting in "${@}" ; do
                 if [ "${requested_setting}" == "${setting_name}" ] ; then
                     export "${setting_name}"="${setting_value}"
                     debug 10 "Loaded config parameter ${setting_name} with value of '${setting_value}'"
                 fi
             done
         fi
-    done < "${config_file}";
+    done
+
+    # Print settings if needed when piping
+    if ${print_settings}; then
+        for setting in "${@}"; do
+            echo "${setting}=${!setting}"
+        done
+    fi
 }
 
 # Load settings from config file if they have not been set already