From 266518d637de634c096c3998ffd717affcca93af Mon Sep 17 00:00:00 2001
From: Brad Rydzewski <brad.rydzewski@gmail.com>
Date: Wed, 30 Sep 2015 23:01:51 -0700
Subject: [PATCH] setup auto-deploying .deb file and docker image

---
 .drone.sec             |  1 +
 .drone.yml             | 33 ++++++++++++++++++++++-----------
 static/scripts/term.js |  3 +++
 3 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 .drone.sec

diff --git a/.drone.sec b/.drone.sec
new file mode 100644
index 000000000..28fde5495
--- /dev/null
+++ b/.drone.sec
@@ -0,0 +1 @@
+eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.U91a1_dSHxTq_nlg3WhIEZ7gDU8-H0zZ2kI-8wlX4Is--2IGux9ek3kC-L_Lvsfgn8Sif4UIP7YEFB2TSka84i8w0R5VU716l1FaCp3_C62DTE71c4WsH1iP8gFOvZEyzLX44MRYobf5zWdiIDgwIJWM7BBxWS8WhP0BxPZ-gt2HiWI2KYs1CQDLTbKdn5mp15miNJbTIRcRhKbNx82INc8F63muIYhzcd88hm_kgAkwHsYFc-xWuGHxkoEcG-cVPlQ0XYAgqgM8KpEhtz3TMJezQOOCyXDH5qniYAXCa8OVRGVTVN-jbuaGC3_MtZ6BrEp7RdYUYK2ykH-7AJ2w2g.Oh7X3L075pqKXYGW.hte4YmLQHbQ87tvI3P-LXff3iuzFXrsaIGfiAuUmj3lsCP8exNSnWOc0IdCRbKkuYdAulNIXHofzKDK2hupi7qN-HWnqjnFpVWsLF-t1ZlAe0c8wz9YCZncAeis1RcjHtQ8lPO7c3y8VGhliO5KnhyMnrvDTePdsF2in3IsnW8Cb4yf3PpRhHmqS5OVonmeu2zbJ-ExMJqn6qn_YxoDUtNARkZL8MfxcbANgdrBYxqSYj-6QYDg8UFPlvDyH5iCDNd5GcYiZpLdFTaoCMRtFZ8mMW0UH2pHdob-i5NckFNSLu9QkmpJzen8cpwhaItMIEww5zPQSzQcy6-LxePz5GGfwVn8p-lYo7fpd-EVB-c86ZKRL6D02o0iRTnT9g4XcbUbguijEQFXt.3vGvbfQ46Y-m0-D5ukXdAw
diff --git a/.drone.yml b/.drone.yml
index 9638053c4..dca0876af 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -11,14 +11,25 @@ build:
     - make deps gen test
     - make build build_static deb
 
-# publish:
-#   s3:
-#     acl: public-read
-#     region: us-east-1
-#     bucket: downloads.drone.io
-#     access_key: $$AWS_KEY
-#     secret_key: $$AWS_SECRET
-#     source: contrib/debian/drone.deb
-#     target: $$BRANCH/
-#     when:
-#       repo: drone/drone
\ No newline at end of file
+publish:
+  s3:
+    acl: public-read
+    region: us-east-1
+    bucket: downloads.drone.io
+    access_key: $$AWS_KEY
+    secret_key: $$AWS_SECRET
+    source: contrib/debian/drone.deb
+    target: $$BRANCH/
+    when:
+      repo: drone/drone
+
+deploy:
+  docker:
+    username: drone
+    password: $$DOCKER_PASS
+    email: $$DOCKER_EMAIL
+    repo: drone/drone
+    tag: 0.4
+    when:
+      repo: drone/drone
+      branch: 0.4.0
diff --git a/static/scripts/term.js b/static/scripts/term.js
index ef49d73ca..d244f1803 100644
--- a/static/scripts/term.js
+++ b/static/scripts/term.js
@@ -350,6 +350,9 @@ Filter = (function() {
 			}, {
 				pattern: /^\n+/,
 				sub: newline
+			}, {
+				pattern: /^\r+/,
+				sub: newline
 			}, {
 				pattern: /^\x1b\[((?:\d{1,3};?)+|)m/,
 				sub: ansiMess