From 0d70eb9fc24966ce3ed483f8d8dfa05f1c1d7041 Mon Sep 17 00:00:00 2001
From: Nick Snyder <nickdsnyder@gmail.com>
Date: Thu, 1 Nov 2018 15:26:58 -0700
Subject: [PATCH] improve dev-sourcegraph-server.sh (#640)

---
 dev/dev-sourcegraph-server.sh            | 5 +++--
 enterprise/dev/dev-sourcegraph-server.sh | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dev/dev-sourcegraph-server.sh b/dev/dev-sourcegraph-server.sh
index 212d2a1d4a4..f74d2e20dbd 100755
--- a/dev/dev-sourcegraph-server.sh
+++ b/dev/dev-sourcegraph-server.sh
@@ -1,5 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
+cd $(dirname "${BASH_SOURCE[0]}")/..
 set -ex
 
 # Build a Sourcegraph server docker image to run for development purposes. Note
@@ -8,4 +9,4 @@ set -ex
 time cmd/server/pre-build.sh
 IMAGE=sourcegraph/server:$USER-dev VERSION=$USER-dev time cmd/server/build.sh
 
-IMAGE=sourcegraph/server:$USER-dev ${BASH_SOURCE%/*}/run-server-image.sh
+IMAGE=sourcegraph/server:$USER-dev dev/run-server-image.sh
diff --git a/enterprise/dev/dev-sourcegraph-server.sh b/enterprise/dev/dev-sourcegraph-server.sh
index c92a45995d4..fc3e2dd6a1a 100755
--- a/enterprise/dev/dev-sourcegraph-server.sh
+++ b/enterprise/dev/dev-sourcegraph-server.sh
@@ -5,7 +5,7 @@ set -ex
 
 # Build a Sourcegraph server docker image with private code built in to run for
 # development purposes
-time ../sourcegraph/cmd/server/pre-build.sh
-IMAGE=sourcegraph/server:$USER-dev VERSION=$USER-dev time cmd/server/build.sh
+time cmd/server/pre-build.sh
+IMAGE=sourcegraph/server:$USER-dev-enterprise VERSION=$USER-dev-enterprise time cmd/server/build.sh
 
-IMAGE=sourcegraph/server:$USER-dev ../sourcegraph/dev/run-server-image.sh
+IMAGE=sourcegraph/server:$USER-dev-enterprise ../dev/run-server-image.sh