From b7743c581629a30ccd9b5abd6cf5ab8d67faa387 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Wed, 11 Apr 2018 22:22:20 -0700
Subject: [PATCH] fix dev.pinafore.social deployments in travis

---
 package-lock.json | 9 ---------
 package.json      | 7 ++++---
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 01c8634..be1607f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4650,15 +4650,6 @@
         }
       }
     },
-    "git-branch-is": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/git-branch-is/-/git-branch-is-0.1.0.tgz",
-      "integrity": "sha1-vvWmETow9AB+fAAvm6TPN5JcFx8=",
-      "dev": true,
-      "requires": {
-        "commander": "2.12.2"
-      }
-    },
     "glob": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
diff --git a/package.json b/package.json
index ee58f78..afed5e5 100644
--- a/package.json
+++ b/package.json
@@ -24,9 +24,10 @@
     "globalize-css": "node ./bin/globalize-css.js",
     "deglobalize-css": "node ./bin/globalize-css.js --reverse",
     "stage-dev": "printf 'User-agent: *\nDisallow: /' > assets/robots.txt",
-    "deploy-dev": "git-branch-is master && npm run stage-dev && now && sleep 60 && now alias dev.pinafore.social && now rm pinafore --safe --yes",
+    "deploy-dev": "npm run stage-dev && now && sleep 60 && now alias dev.pinafore.social && now rm pinafore --safe --yes",
     "stage-prod": "rm -f assets/robots.txt",
-    "deploy-prod": "git-branch-is master && npm run stage-prod && now && sleep 60 && now alias pinafore.social && now rm pinafore --safe --yes",
+    "deploy-prod": "npm run stage-prod && now && sleep 60 && now alias pinafore.social && now rm pinafore --safe --yes",
+    "deploy-dev-travis": "if [[ $TRAVIS_BRANCH == master ]]; then npm run stage-dev && now --token $NOW_TOKEN && sleep 60 && now alias dev.pinafore.social --token $NOW_TOKEN && now rm pinafore --safe --yes; fi",
     "backup-mastodon-data": "pg_dump -Fc mastodon_development > fixtures/dump.sql && cd mastodon/public/system && tar -czf ../../../fixtures/system.tgz ."
   },
   "dependencies": {
@@ -79,7 +80,6 @@
     "yargs": "^10.1.1"
   },
   "devDependencies": {
-    "git-branch-is": "^0.1.0",
     "now": "^10.2.2",
     "standard": "^10.0.3",
     "testcafe": "^0.19.0"
@@ -126,6 +126,7 @@
     "cjs": "vars"
   },
   "now": {
+    "type": "npm",
     "env": {
       "NODE_ENV": "production"
     },