|
|
|
|
@ -63,7 +63,7 @@ function _set_path_variables()
|
|
|
|
|
REPO_DIR="$TDE_DIR/$CFG_GIT_DIR"
|
|
|
|
|
REPO_TDE="$TDE_DIR/$CFG_GIT_DIR/tde"
|
|
|
|
|
REPO_TDE_MAIN="$REPO_TDE/main"
|
|
|
|
|
REPO_TDE_PACKAGING="$TDE_DIR/$CFG_GIT_DIR/tde-packaging/$DISTRO/$DISTRO_NAME"
|
|
|
|
|
REPO_TDE_PACKAGING="$TDE_DIR/$CFG_GIT_DIR/tde/packaging/$DISTRO/$DISTRO_NAME"
|
|
|
|
|
REPO_EXTRA_DEPENDENCIES="$TDE_DIR/$CFG_GIT_DIR/$CFG_EXTRA_DEPS_DIR"
|
|
|
|
|
|
|
|
|
|
BUILD_DIR="$TDE_DIR/$CFG_BUILD_DIR"
|
|
|
|
|
@ -86,7 +86,7 @@ function init_common()
|
|
|
|
|
|
|
|
|
|
# Prevent the script to be run from TDE packaging repo
|
|
|
|
|
REPO_URL=$(git config --get remote.origin.url 2>/dev/null)
|
|
|
|
|
if [ ! -z "$REPO_URL" ] && [ -z "${REPO_URL##*tde-packaging}" ]; then
|
|
|
|
|
if [ ! -z "$REPO_URL" ] && [ -z "${REPO_URL##*tde/packaging}" ]; then
|
|
|
|
|
echo -e "${CLightRed} --- ERROR ---${CNone}"
|
|
|
|
|
echo "This script cannot be run from the TDE packaging repository."
|
|
|
|
|
echo "Please follow the instructions provided, then rerun this script."
|
|
|
|
|
@ -126,7 +126,7 @@ function init_common()
|
|
|
|
|
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"
|
|
|
|
|
REPO_TDE_PACKAGING="$TDE_DIR/$CFG_GIT_DIR/tde/packaging/$l_packaging_path"
|
|
|
|
|
fi
|
|
|
|
|
break
|
|
|
|
|
fi
|
|
|
|
|
@ -162,18 +162,6 @@ function init_common()
|
|
|
|
|
exit 6
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Search for TDE packaging repo
|
|
|
|
|
CURR_DIR=""
|
|
|
|
|
[ -d "$REPO_TDE_PACKAGING" ] && cd "$REPO_TDE_PACKAGING" &>/dev/null && \
|
|
|
|
|
CURR_DIR=$(git rev-parse --show-toplevel 2>/dev/null)
|
|
|
|
|
if [ -z "$CURR_DIR" ]; then
|
|
|
|
|
echo -e "${CLightRed} --- ERROR ---${CNone}"
|
|
|
|
|
echo "The TDE packaging repo could not be located. Something is wrong with your configuration"
|
|
|
|
|
echo -e "in the config file ${CLightPurple}$CFG_FILE${CNone}"
|
|
|
|
|
echo -e "Please check and modify the ${CLightCyan}TDE_DIR${CNone} variable as required, then rerun this script."
|
|
|
|
|
exit 7
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Check branch configuration
|
|
|
|
|
# - branch existance
|
|
|
|
|
UPDATE_BRANCHES="${OVERRIDE_UPDATE_BRANCHES:-$UPDATE_BRANCHES}"
|
|
|
|
|
|
