From b85526576a941116b2e00dc5335032634c5e3e63 Mon Sep 17 00:00:00 2001
From: Umair Khan <umair.waheed@gmail.com>
Date: Thu, 26 May 2016 15:44:30 +0500
Subject: [PATCH] Move tools/postgres-init-dev-db to tools/setup/.

---
 README.dev.md                          | 2 +-
 provision.py                           | 2 +-
 tools/{ => setup}/postgres-init-dev-db | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename tools/{ => setup}/postgres-init-dev-db (88%)

diff --git a/README.dev.md b/README.dev.md
index 8cbc4805e2..3c1dc693b1 100644
--- a/README.dev.md
+++ b/README.dev.md
@@ -337,7 +337,7 @@ pip install --no-deps -r requirements.txt
 ./scripts/setup/generate_secrets.py -d
 if [ $(uname) = "OpenBSD" ]; then sudo cp ./puppet/zulip/files/postgresql/zulip_english.stop /var/postgresql/tsearch_data/; else sudo cp ./puppet/zulip/files/postgresql/zulip_english.stop /usr/share/postgresql/9.3/tsearch_data/; fi
 ./scripts/setup/configure-rabbitmq
-./tools/postgres-init-dev-db
+./tools/setup/postgres-init-dev-db
 ./tools/do-destroy-rebuild-database
 ./tools/setup/postgres-init-test-db
 ./tools/do-destroy-rebuild-test-database
diff --git a/provision.py b/provision.py
index 17291ce9ea..62c011704f 100644
--- a/provision.py
+++ b/provision.py
@@ -181,7 +181,7 @@ def main():
         run(["sudo", "service", "redis-server", "restart"])
         run(["sudo", "service", "memcached", "restart"])
     run(["scripts/setup/configure-rabbitmq"])
-    run(["tools/postgres-init-dev-db"])
+    run(["tools/setup/postgres-init-dev-db"])
     run(["tools/do-destroy-rebuild-database"])
     run(["tools/setup/postgres-init-test-db"])
     run(["tools/do-destroy-rebuild-test-database"])
diff --git a/tools/postgres-init-dev-db b/tools/setup/postgres-init-dev-db
similarity index 88%
rename from tools/postgres-init-dev-db
rename to tools/setup/postgres-init-dev-db
index 0eb2ee853f..e6eada14dd 100755
--- a/tools/postgres-init-dev-db
+++ b/tools/setup/postgres-init-dev-db
@@ -22,7 +22,7 @@ VAGRANTUSERNAME=$(whoami)
 
 if [[ $# == 0 ]]; then
     USERNAME=zulip
-    PASSWORD=$("$(dirname "$0")/../scripts/get-django-setting" LOCAL_DATABASE_PASSWORD)
+    PASSWORD=$("$(dirname "$0")/../../scripts/get-django-setting" LOCAL_DATABASE_PASSWORD)
     DBNAME=zulip
     SEARCH_PATH="$USERNAME",public
 elif [[ $# == 4 ]]; then
@@ -60,7 +60,7 @@ else
 fi
 chmod go-rw ~/.pgpass
 
-"$(dirname "$0")/../scripts/setup/terminate-psql-sessions" "$USERNAME" "$DBNAME" "$DBNAME_BASE"
+"$(dirname "$0")/../../scripts/setup/terminate-psql-sessions" "$USERNAME" "$DBNAME" "$DBNAME_BASE"
 
 psql -h localhost postgres "$USERNAME" <<EOF
 DROP DATABASE IF EXISTS $DBNAME;
@@ -80,7 +80,7 @@ psql -h localhost postgres "$USERNAME" <<EOF
 CREATE DATABASE $DBNAME TEMPLATE $DBNAME_BASE;
 EOF
 
-sh "$(dirname "$0")/../scripts/setup/flush-memcached"
+sh "$(dirname "$0")/../../scripts/setup/flush-memcached"
 
 echo "Database created"