diff options
Diffstat (limited to 'debian/_buildscripts/local/internals/_build_common.sh')
| -rwxr-xr-x | debian/_buildscripts/local/internals/_build_common.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/debian/_buildscripts/local/internals/_build_common.sh b/debian/_buildscripts/local/internals/_build_common.sh index 5e4ba67fe..8b048a635 100755 --- a/debian/_buildscripts/local/internals/_build_common.sh +++ b/debian/_buildscripts/local/internals/_build_common.sh @@ -50,7 +50,7 @@ function echo_and_tee() } #---------------------------- -function _set_path_varables() +function _set_path_variables() { # Set useful path variables set -a @@ -91,7 +91,7 @@ function init_common() CFG_FILE=$SCRIPT_DIR/_config.sh if [ -f "$CFG_FILE" ]; then . "$CFG_FILE" - _set_path_varables + _set_path_variables else echo -e "${CLightRed} --- NOTE ---${CNone}" echo -e "Creating TDE build configuration file from template as ${CLightPurple}$CFG_FILE${CNone}." @@ -111,11 +111,16 @@ function init_common() # -- Need to use a "here string" otherwise if the DISTRO_FOUND value is modified # -- inside the while loop, this would not remember after the loop. DISTRO_FOUND="n" - while read l_distro l_version l_name l_rel_suffix; do + while read l_distro l_version l_name l_rel_suffix l_packaging_path; do if [ "$l_distro" = "$DISTRO" -a "$l_name" = "$DISTRO_NAME" ]; then DISTRO_FOUND="y" + l_rel_suffix=`echo "$l_rel_suffix" | perl -pe "s|^[\"']?(.*?)[\"']?$|\1|g"` + l_packaging_path=`echo "$l_packaging_path" | perl -pe "s|^[\"']?(.*?)[\"']?$|\1|g"` export DISTRO_VERSION="$l_version" export REL_SUFFIX="$l_rel_suffix" + if [[ ! -z "$l_packaging_path" ]]; then + REPO_TDE_PACKAGING="$TDE_DIR/$CFG_GIT_DIR/tde-packaging/$l_packaging_path" + fi break fi done <<< $(cat $DISTS_FILE | grep -E "^(\s*[^#\s]+\s+[^\s]+.*)$") @@ -163,6 +168,7 @@ function init_common() # Check branch configuration # - branch existance + UPDATE_BRANCHES="${OVERRIDE_UPDATE_BRANCHES:-$UPDATE_BRANCHES}" cd "$REPO_TDE" BRANCHES=() REMOTE_BRANCHES=(`git branch --remote | grep -v "HEAD" | sed "s|origin/||g"`) |