Create dir to fix nested file send

client/ssh.go

@@ -7,7 +7,7 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
-	"path"
+	"path/filepath"
 
 	"github.com/ubclaunchpad/inertia/cfg"
 	"golang.org/x/crypto/ssh"
@@ -124,22 +124,23 @@ func (runner *SSHRunner) CopyFile(file io.Reader, remotePath string, permissions
 	}
 	reader := bytes.NewReader(contents)
 
-	// Send file contents
-	filename := path.Base(remotePath)
-	directory := path.Dir(remotePath)
+	// Set up
+	filename := filepath.Base(remotePath)
+	directory := filepath.Dir(remotePath)
 	session, err := getSSHSession(runner.pem, runner.ip, runner.sshPort, runner.user)
 	if err != nil {
 		return err
 	}
 
+	// Send file contents
 	go func() {
 		w, _ := session.StdinPipe()
 		defer w.Close()
 		fmt.Fprintln(w, "C"+permissions, len(contents), filename)
 		io.Copy(w, reader)
 		fmt.Fprintln(w, "\x00")
 	}()
-	session.Run("/usr/bin/scp -t " + directory)
+	session.Run("mkdir -p " + directory + "; /usr/bin/scp -t " + directory)
 	return nil
 }
 

deploy.go

@@ -9,7 +9,6 @@ import (
 	"net/http"
 	"os"
 	"path"
-	"path/filepath"
 	"strings"
 
 	"github.com/ubclaunchpad/inertia/common"
@@ -379,13 +378,7 @@ deployment. Provide a relative path to your file.`,
 		if err != nil {
 			log.Fatal(err.Error())
 		}
-		if dest != "" {
-			// If path is defined, dest = [path]/[filename], with the user-provided
-			// path to the source file stripped out
-			dest = path.Join(dest, filepath.Base(args[0]))
-		} else {
-			// Otherwise, dest = [filepath], where [filepath] is what the user
-			// provided to the command
+		if dest == "" {
 			dest = args[0]
 		}