From 612158b3192344b1059f174b47c8eb8afec368fe Mon Sep 17 00:00:00 2001
From: Isaac Hollander McCreery <ihmccreery@google.com>
Date: Thu, 29 Oct 2015 16:06:55 -0700
Subject: [PATCH] A few more fixups

---
 release/build-official-release.sh |  2 +-
 release/cut-official-release.sh   | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/release/build-official-release.sh b/release/build-official-release.sh
index 176b32cb33f..d539cdb0499 100755
--- a/release/build-official-release.sh
+++ b/release/build-official-release.sh
@@ -88,7 +88,7 @@ ln -s ${KUBE_BUILD_DIR}/_output/release-tars/kubernetes.tar.gz ${KUBE_BUILD_DIR}
 MD5=$(md5 "${KUBE_BUILD_DIR}/kubernetes.tar.gz")
 SHA1=$(sha1 "${KUBE_BUILD_DIR}/kubernetes.tar.gz")
 
-echo <<- EOM
+cat <<- EOM
 
 Success! You must now do the following: (you may want to cut
   and paste these instructions elsewhere, step 1 can be spammy)
diff --git a/release/cut-official-release.sh b/release/cut-official-release.sh
index 328f90027fa..da527426f3a 100755
--- a/release/cut-official-release.sh
+++ b/release/cut-official-release.sh
@@ -187,12 +187,12 @@ function alpha-release() {
 - Finish the ${alpha_version} release build:
   - From this directory (clone of upstream/master),
       ./release/build-official-release.sh ${alpha_version}
-  - Figure out what the PR numbers for this release and last release are, and
-    get an api-token from GitHub (https://github.com/settings/tokens).  From a
-    clone of kubernetes/contrib at upstream/master,
-      go run release-notes/release-notes.go --last-release-pr=<number> --current-release-pr=<number> --api-token=<token>
-    Feel free to prune, but typically for patch releases we tend to include
-    everything in the release notes.
+  - Prep release notes:
+    - Figure out what the PR numbers for this release and last release are, and
+      get an api-token from GitHub (https://github.com/settings/tokens).  From a
+      clone of kubernetes/contrib at upstream/master,
+        go run release-notes/release-notes.go --last-release-pr=<number> --current-release-pr=<number> --api-token=<token>
+      Feel free to prune.
 EOM
 }
 
@@ -226,12 +226,12 @@ function official-release() {
   git-push "${official_version}"
 
   cat >> "${INSTRUCTIONS}" <<- EOM
-- Finish the ${version} release build:
+- Finish the ${official_version} release build:
   - From this directory (clone of upstream/master),
-      ./release/build-official-release.sh ${version}
+      ./release/build-official-release.sh ${official_version}
   - Prep release notes:
     - From this directory (clone of upstream/master), run
-        ./hack/cherry_pick_list.sh ${version}
+        ./hack/cherry_pick_list.sh ${official_version}
       to get the release notes for the patch release you just created. Feel
       free to prune anything internal, but typically for patch releases we tend
       to include everything in the release notes.
@@ -245,7 +245,7 @@ function verify-at-git-commit() {
   local -r git_commit="${1}"
   echo "Verifying we are at ${git_commit}."
   if [[ $(current-git-commit) != ${git_commit} ]]; then
-    echo <<- EOM
+    cat <<- EOM
 !!! We are not at commit ${git_commit}! (If you're cutting an official release,
 that probably means your release branch isn't frozen, so the commit you want to
 release isn't at HEAD of the release branch.)"