From 721a5ed5c8edeb22663f6ba299c076f525c5f86e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=9D=E3=83=BC=E3=83=AB=20=E3=82=A6=E3=82=A7=E3=83=83?=
 =?UTF-8?q?=E3=83=96?= <netopwibby@thenetwork.email>
Date: Tue, 19 Mar 2019 09:25:11 -0500
Subject: [PATCH] Update install/upgrade instructions

---
 INSTALL.md | 3 ++-
 dev.sh     | 2 +-
 update.php | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index ed1ad530..0aee1733 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -8,7 +8,8 @@ To run this project, you'll need to have either PHP7 or Docker installed, and be
 
 - Install [PHP7](http://php.net/downloads.php)
 - Possibly install additional PHP extensions: `curl`, `xml`, `mbstring`, `dom`
-- Checkout the project. Be sure to install/update submodules (`git submodule update --recursive --remote`).
+- Checkout the project and be sure to install submodules: `git submodule update --init`
+- If you have already cloned the project, be sure to update submodules: `git submodule update --recursive --remote`
 - Run `./dev.sh` from the project root
 - Access [localhost:8000](http://localhost:8000) in your browser
 
diff --git a/dev.sh b/dev.sh
index fc18ea7b..474dfc5c 100755
--- a/dev.sh
+++ b/dev.sh
@@ -18,5 +18,5 @@ fi
 $DIR/hooks/install.sh
 
 $PHPBIN composer.phar install
-
+git submodule update --init
 $PHPBIN --server localhost:8000 --docroot "$DIR/web" "$DIR/web/index.php"
diff --git a/update.php b/update.php
index 3647f8dc..f8715c2f 100755
--- a/update.php
+++ b/update.php
@@ -16,7 +16,8 @@ if (!$force && !file_exists($needsUpdateFile)) {
 
 chdir(ROOT_DIR);
 
-Shell::exec('git fetch && git reset --hard origin/904-unify');
+Shell::exec('git fetch && git reset --hard origin/master');
+Shell::exec('git submodule update --init');
 Shell::exec('git pull --recurse-submodules');
 Shell::exec('php composer.phar install');