Fixes and preperations for agent 1.0-beta.3

Author: keithpitt

buildbox/script.go

@@ -40,11 +40,10 @@ func InitProcess(scriptPath string, env []string, runInPty bool, callback func(*
 	var process Process
 	process.RunInPty = runInPty
 
-	// Find the script to run
-	pathToScript, _ := filepath.Abs(path.Dir(scriptPath))
-	localScriptName := path.Base(scriptPath)
+	process.command = exec.Command(scriptPath)
 
-	process.command = exec.Command(localScriptName)
+	// Set the working directory of the process
+	pathToScript, _ := filepath.Abs(path.Dir(scriptPath))
 	process.command.Dir = pathToScript
 
 	// Children of the forked process will inherit its process group

buildbox/version.go

@@ -1,5 +1,5 @@
 package buildbox
 
 const (
-	Version = "1.0-beta.2"
+	Version = "1.0-beta.3"
 )

command/agent_start.go

@@ -40,7 +40,7 @@ func AgentStartCommandAction(c *cli.Context) {
 	// Create a client so we can register the agent
 	var client buildbox.Client
 	client.AuthorizationToken = agentRegistrationToken
-	client.URL = c.String("url")
+	client.URL = c.String("endpoint")
 
 	agentMetaData := c.StringSlice("meta-data")
 
@@ -65,7 +65,7 @@ func AgentStartCommandAction(c *cli.Context) {
 	}
 
 	// Start the agent using the token we have
-	agent := setupAgent(agentAccessToken, bootstrapScript, !c.Bool("no-pty"), c.String("url"))
+	agent := setupAgent(agentAccessToken, bootstrapScript, !c.Bool("no-pty"), c.String("endpoint"))
 
 	// Setup signal monitoring
 	agent.MonitorSignals()

command/artifact_download.go

@@ -52,7 +52,7 @@ func ArtifactDownloadCommandAction(c *cli.Context) {
 
 	// Client specific options
 	agent.Client.AuthorizationToken = agentAccessToken
-	agent.Client.URL = c.String("url")
+	agent.Client.URL = c.String("endpoint")
 
 	// Setup the agent
 	agent.Setup()

command/artifact_upload.go

@@ -43,7 +43,7 @@ func ArtifactUploadCommandAction(c *cli.Context) {
 
 	// Client specific options
 	agent.Client.AuthorizationToken = agentAccessToken
-	agent.Client.URL = c.String("url")
+	agent.Client.URL = c.String("endpoint")
 
 	// Setup the agent
 	agent.Setup()

command/data_get.go

@@ -28,7 +28,7 @@ func DataGetCommandAction(c *cli.Context) {
 	// Create a client so we can register the agent
 	var client buildbox.Client
 	client.AuthorizationToken = agentAccessToken
-	client.URL = c.String("url")
+	client.URL = c.String("endpoint")
 
 	// Find the job
 	job, err := client.JobFind(jobId)

command/data_set.go

@@ -28,7 +28,7 @@ func DataSetCommandAction(c *cli.Context) {
 	// Create a client so we can register the agent
 	var client buildbox.Client
 	client.AuthorizationToken = agentAccessToken
-	client.URL = c.String("url")
+	client.URL = c.String("endpoint")
 
 	// Find the job
 	job, err := client.JobFind(jobId)

install.sh

@@ -14,9 +14,15 @@ then
   exit 1
 fi
 
+if [ "$VERSION" = "1.0-beta.2" ]
+then
+  echo "NOTICE: Installing 1.0-beta.2 is no longer supported...sorry. Please install 1.0-beta.3"
+  exit 1
+fi
+
 if [ "$BETA" = "true" ]
 then
-  VERSION="1.0-beta.2"
+  VERSION="1.0-beta.3"
 fi
 
 # Allow custom setting of the version
@@ -97,7 +103,7 @@ tar -C $DESTINATION -zxf $DESTINATION/$DOWNLOAD
 
 INSTALLED_VERSION=`$DESTINATION/buildbox-agent --version`
 
-if [[ "$INSTALLED_VERSION" = "buildbox version 1.0-beta.2" ]]
+if [[ "$INSTALLED_VERSION" = "buildbox-agent version 1.0-beta.3" ]]
 then
   # Move the buildbox binary into a bin folder
   mkdir -p $DESTINATION/bin

templates/bootstrap.sh

@@ -17,6 +17,11 @@ function buildbox-run {
 
 echo '--- setup environment'
 
+if [ "$BUILDBOX_AGENT_DEBUG" == "true" ]
+then
+  buildbox-run "env | grep BUILDBOX"
+fi
+
 # This will return the location of this file. We assume that the buildbox-artifact
 # tool is in the same folder. You can of course customize the locations
 # and edit this file.