Trying to fix the ubuntu package generation break. I believe it happened because we were loading branchinfo in the init-tools, which means that the env variables defined there were not applied to commands ran from run-build.sh.

This commit is contained in:
Livar Cunha 2016-07-06 13:35:34 -07:00
parent 7e71a0217a
commit f400160a09
2 changed files with 8 additions and 8 deletions

View file

@ -14,12 +14,4 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
done
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
# Load Branch Info
while read line; do
if [[ $line != \#* ]]; then
IFS='=' read -ra splat <<< "$line"
export ${splat[0]}="${splat[1]}"
fi
done < "$DIR/branchinfo.txt"
$DIR/scripts/obtain/dotnet-install.sh --channel $CHANNEL --verbose

View file

@ -71,6 +71,14 @@ else
exit 1
fi
# Load Branch Info
while read line; do
if [[ $line != \#* ]]; then
IFS='=' read -ra splat <<< "$line"
export ${splat[0]}="${splat[1]}"
fi
done < "$REPOROOT/branchinfo.txt"
# Use a repo-local install directory (but not the artifacts directory because that gets cleaned a lot
[ -z "$DOTNET_INSTALL_DIR" ] && export DOTNET_INSTALL_DIR=$REPOROOT/.dotnet_stage0/$ARCHITECTURE
[ -d "$DOTNET_INSTALL_DIR" ] || mkdir -p $DOTNET_INSTALL_DIR