From 137336d0d0d455c0f77fa29dab6685868dcba7ae Mon Sep 17 00:00:00 2001
From: Sridhar Periyasamy <sridhper@microsoft.com>
Date: Wed, 20 Jan 2016 19:08:00 -0800
Subject: [PATCH] Download the stage0 dotnet tools from the beta feed for unix.

Set the correct channel so that the stage0 binaries are downloaded
correctly.

** This commit cannot be directly merged from the release branch to the
master branch **
---
 scripts/build/generate-version.sh | 1 -
 scripts/common/_common.sh         | 2 ++
 scripts/compile/compile-stage.sh  | 2 +-
 scripts/obtain/install.sh         | 6 ++++--
 scripts/package/package-debian.sh | 4 ++--
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/scripts/build/generate-version.sh b/scripts/build/generate-version.sh
index d5d5d6cba..8d541bc4f 100755
--- a/scripts/build/generate-version.sh
+++ b/scripts/build/generate-version.sh
@@ -4,7 +4,6 @@
 # Licensed under the MIT license. See LICENSE file in the project root for full license information.
 #
 
-export RELEASE_SUFFIX=beta
 export MAJOR_VERSION=1
 export MINOR_VERSION=0
 export PATCH_VERSION=0
diff --git a/scripts/common/_common.sh b/scripts/common/_common.sh
index cb0b856c1..6f33b6c7d 100644
--- a/scripts/common/_common.sh
+++ b/scripts/common/_common.sh
@@ -23,6 +23,8 @@ export DNX_ROOT=$DNX_DIR/bin
 export STAGE1_DIR=$OUTPUT_ROOT/stage1
 export STAGE2_DIR=$OUTPUT_ROOT/stage2
 export HOST_DIR=$OUTPUT_ROOT/corehost
+export RELEASE_SUFFIX=beta
+export CHANNEL=$RELEASE_SUFFIX
 
 [ -z "$DOTNET_INSTALL_DIR" ] && export DOTNET_INSTALL_DIR=$REPOROOT/.dotnet_stage0/$RID
 [ -z "$DOTNET_CLI_VERSION" ] && export DOTNET_CLI_VERSION=0.1.0.0
diff --git a/scripts/compile/compile-stage.sh b/scripts/compile/compile-stage.sh
index 7d0271414..3853cc345 100755
--- a/scripts/compile/compile-stage.sh
+++ b/scripts/compile/compile-stage.sh
@@ -118,4 +118,4 @@ fi
 # Stamp the output with the commit metadata
 COMMIT=$(git rev-parse HEAD)
 echo $COMMIT > $OUTPUT_DIR/.version
-echo $DOTNET_BUILD_VERSION >> $OUTPUT_DIR/.version
+echo $DOTNET_CLI_VERSION >> $OUTPUT_DIR/.version
diff --git a/scripts/obtain/install.sh b/scripts/obtain/install.sh
index a5c19042e..9dfd77b67 100755
--- a/scripts/obtain/install.sh
+++ b/scripts/obtain/install.sh
@@ -54,6 +54,8 @@ exec "$MY_TARGET" "$@"
 EOF
 )
 
+[ -z "$CHANNEL" ] && CHANNEL="dev"
+
 #set default prefix (PREFIX is a fairly standard env-var, but we also want to allow the use the specific "DOTNET_INSTALL_DIR" one)
 if [ ! -z "$DOTNET_INSTALL_DIR" ]; then
     PREFIX=$DOTNET_INSTALL_DIR
@@ -171,13 +173,13 @@ install_dotnet()
     fi
     local os=$(current_os)
     local installLocation="$PREFIX/share/dotnet"
-    local dotnet_url="https://dotnetcli.blob.core.windows.net/dotnet/dev/Binaries/Latest"
+    local dotnet_url="https://dotnetcli.blob.core.windows.net/dotnet/$CHANNEL/Binaries/Latest"
     local dotnet_filename="dotnet-$os-x64.latest.tar.gz"
 
     if [ "$RELINK" = "0" ]; then
         if [ "$FORCE" = "0" ]; then
             # Check if we need to bother
-            local remoteData="$(curl -s https://dotnetcli.blob.core.windows.net/dotnet/dev/dnvm/latest.$os.version)"
+            local remoteData="$(curl -s https://dotnetcli.blob.core.windows.net/dotnet/$CHANNEL/dnvm/latest.$os.version)"
             [ $? != 0 ] && say_err "Unable to determine latest version." && return 1
 
             local remoteVersion=$(IFS="\n" && echo $remoteData | tail -n 1)
diff --git a/scripts/package/package-debian.sh b/scripts/package/package-debian.sh
index 35fabb8e1..c8f8b2a6e 100755
--- a/scripts/package/package-debian.sh
+++ b/scripts/package/package-debian.sh
@@ -35,7 +35,7 @@ MANPAGE_DIR="$REPOROOT/Documentation/manpages"
 NIGHTLY_PACKAGE_NAME="dotnet-nightly"
 RELEASE_PACKAGE_NAME="dotnet"
 
-[ -z "$RELEASE_SUFFIX" ] && RELEASE_SUFFIX="dev"
+[ -z "$CHANNEL" ] && CHANNEL="dev"
 
 execute_build(){
     determine_package_name
@@ -97,7 +97,7 @@ test_debian_package(){
     header "Testing debian package"
     
     # Set LAST_VERSION_URL to enable upgrade tests
-    export LAST_VERSION_URL="https://dotnetcli.blob.core.windows.net/dotnet/$RELEASE_SUFFIX/Installers/Latest/dotnet-ubuntu-x64.latest.deb"
+    export LAST_VERSION_URL="https://dotnetcli.blob.core.windows.net/dotnet/$CHANNEL/Installers/Latest/dotnet-ubuntu-x64.latest.deb"
 
     rm -rf $TEST_STAGE_DIR
     git clone https://github.com/sstephenson/bats.git $TEST_STAGE_DIR