From 65b875be277f95afe7816ff5c987eedc28f54669 Mon Sep 17 00:00:00 2001
From: Oling Cat <olingcat@gmail.com>
Date: Sun, 14 Dec 2014 17:00:44 +0800
Subject: [PATCH] cmd/godoc: update GAE setup script

Change-Id: Ief2c49a03cbd3251d62d854be4f51dcb27a42458
Reviewed-on: https://go-review.googlesource.com/1522
Reviewed-by: Andrew Gerrand <adg@golang.org>
---
 cmd/godoc/setup-godoc-app.bash | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cmd/godoc/setup-godoc-app.bash b/cmd/godoc/setup-godoc-app.bash
index 284df8bb..9d82cd74 100755
--- a/cmd/godoc/setup-godoc-app.bash
+++ b/cmd/godoc/setup-godoc-app.bash
@@ -33,8 +33,8 @@ getArgs() {
 	if [ -z $APPENGINE_SDK ]; then
 		error "APPENGINE_SDK environment variable not set"
 	fi
-	if [ ! -x $APPENGINE_SDK/go ]; then
-		error "couldn't find go comment in $APPENGINE_SDK"
+	if [ ! -x $APPENGINE_SDK/goapp ]; then
+		error "couldn't find goapp command in $APPENGINE_SDK"
 	fi
 	if [ -z $GOROOT ]; then
 		GOROOT=$(go env GOROOT)
@@ -47,7 +47,7 @@ getArgs() {
 		APPDIR=$1
 		echo "APPDIR not set, using argument instead"
 	fi
-	
+
 	# safety checks
 	if [ ! -d $GOROOT ]; then
 		error "$GOROOT is not a directory"
@@ -64,7 +64,7 @@ getArgs() {
 fetchGodoc() {
 	echo "*** Fetching godoc (if not already in GOPATH)"
 	unset GOBIN
-	go=$APPENGINE_SDK/go
+	go=$APPENGINE_SDK/goapp
 	$go get -d -tags appengine $GODOC
 	mkdir -p $APPDIR/$GODOC
 	cp $(find $($go list -f '{{.Dir}}' $GODOC) -type f -depth 1) $APPDIR/$GODOC/
@@ -76,7 +76,7 @@ makeAppYaml() {
 application: godoc
 version: 1
 runtime: go
-api_version: go1
+api_version: go1.4beta
 
 handlers:
 - url: /.*
@@ -105,7 +105,7 @@ makeConfigfile() {
 package main
 
 // GENERATED FILE - DO NOT MODIFY BY HAND.
-// (generated by $GOROOT/src/cmd/godoc/setup-godoc-app.bash)
+// (generated by golang.org/x/tools/cmd/godoc/setup-godoc-app.bash)
 
 const (
 	// .zip filename