Change work dir to include project name, keep around

[candle] / src / main / aws / aws.lisp

diff --git a/src/main/aws/aws.lisp b/src/main/aws/aws.lisp
index ad224af7439ad7b56ba4ba2a0e17f0cc79fc6935..a6218dd4f6118efbc64c9a53f6428a2adc2496eb 100644 (file)
--- a/src/main/aws/aws.lisp
+++ b/src/main/aws/aws.lisp
@@ -97,8 +97,13 @@
    "--delete"
    "-e"
    (format nil "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ~A" *aws-keyfile*)
+   "--exclude"
+   ".git"
    (candle:project-dir (candle:job-project job))
-   (format nil "~A@~A:~A" *aws-username* (describe-property "PublicIpAddress") *remote-work-dir*)))
+   (format nil "~A@~A:~A/~A" *aws-username*
+    (describe-property "PublicIpAddress")
+    *remote-work-dir*
+    (candle:project-name (candle:job-project job)))))
  (let*
   ((out nil)
    (code nil))
@@ -116,7 +121,10 @@
         "-i"
         *aws-keyfile*
         (describe-property "PublicIpAddress")
-        (format nil "cd ~A ; ~A run" *remote-work-dir* *remote-candle-location*))
+        (format nil "cd ~A/~A ; ~A run --env aws"
+         *remote-work-dir*
+         (candle:project-name (candle:job-project job))
+         *remote-candle-location*))
        :output out-str
        :error out-str
        :wait t)))))