From e573d66b91c6287b5f3af14ef5ec9efecd428289 Mon Sep 17 00:00:00 2001
From: Brad Rydzewski <brad.rydzewski@gmail.com>
Date: Wed, 13 Jul 2016 12:00:07 -0700
Subject: [PATCH] remove unstable acknowledgements

---
 drone/build_start.go |  4 ++--
 drone/server.go      | 46 --------------------------------------------
 2 files changed, 2 insertions(+), 48 deletions(-)

diff --git a/drone/build_start.go b/drone/build_start.go
index 7a871f0cb..00d18aa66 100644
--- a/drone/build_start.go
+++ b/drone/build_start.go
@@ -43,9 +43,9 @@ func buildStart(c *cli.Context) (err error) {
 
 	var build *model.Build
 	if c.Bool("fork") {
-		build, err = client.BuildStart(owner, name, number)
-	} else {
 		build, err = client.BuildFork(owner, name, number)
+	} else {
+		build, err = client.BuildStart(owner, name, number)
 	}
 	if err != nil {
 		return err
diff --git a/drone/server.go b/drone/server.go
index 2e6468b60..a1b9fb06f 100644
--- a/drone/server.go
+++ b/drone/server.go
@@ -1,9 +1,7 @@
 package main
 
 import (
-	"fmt"
 	"net/http"
-	"os"
 	"time"
 
 	"github.com/drone/drone/router"
@@ -263,30 +261,11 @@ var serverCmd = cli.Command{
 			Name:   "stash-skip-verify",
 			Usage:  "stash skip ssl verification",
 		},
-		//
-		// remove these eventually
-		//
-
-		cli.BoolFlag{
-			Name:   "agreement.ack",
-			EnvVar: "I_UNDERSTAND_I_AM_USING_AN_UNSTABLE_VERSION",
-			Usage:  "agree to terms of use.",
-		},
-		cli.BoolFlag{
-			Name:   "agreement.fix",
-			EnvVar: "I_AGREE_TO_FIX_BUGS_AND_NOT_FILE_BUGS",
-			Usage:  "agree to terms of use.",
-		},
 	},
 }
 
 func server(c *cli.Context) error {
 
-	if c.Bool("agreement.ack") == false || c.Bool("agreement.fix") == false {
-		fmt.Println(agreement)
-		os.Exit(1)
-	}
-
 	// debug level if requested by user
 	if c.Bool("debug") {
 		logrus.SetLevel(logrus.DebugLevel)
@@ -324,28 +303,3 @@ func server(c *cli.Context) error {
 		handler,
 	)
 }
-
-var agreement = `
----
-
-
-You are attempting to use the unstable channel. This build is experimental and
-has known bugs and compatibility issues. It is not intended for general use.
-
-Please consider using the latest stable release instead:
-
-		drone/drone:0.4.2
-
-If you are attempting to build from source please use the latest stable tag:
-
-		v0.4.2
-
-If you are interested in testing this experimental build AND assisting with
-development you may proceed by setting the following environment:
-
-		I_UNDERSTAND_I_AM_USING_AN_UNSTABLE_VERSION=true
-		I_AGREE_TO_FIX_BUGS_AND_NOT_FILE_BUGS=true
-
-
----
-`