aboutsummaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2013-02-22 10:07:36 +0000
committerMatthew Somerville <matthew@mysociety.org>2013-02-22 10:07:36 +0000
commitde0bbf71538b74bcc5fbcdcc539f5cb06cbd51b5 (patch)
treedd0bd7fcfcb16edcf5eaa83f88eadee4c347eeed /bin
parentdb240c707e747f4523ccc01bead4e3a1803320cd (diff)
Update install script to install v1.1, update README about v1.1.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/install-as-user2
-rw-r--r--bin/site-specific-install.sh6
2 files changed, 7 insertions, 1 deletions
diff --git a/bin/install-as-user b/bin/install-as-user
index 2e0816966..b9dfa3973 100755
--- a/bin/install-as-user
+++ b/bin/install-as-user
@@ -101,7 +101,7 @@ fi
# Install the required Perl modules - this may take a very long time:
-cd "$FMS_REPOSITORY"
+cd "$REPOSITORY"
bin/install_perl_modules
# Generate po and mo files (these invocations taken from Kagee's script):
diff --git a/bin/site-specific-install.sh b/bin/site-specific-install.sh
index 6ebac7970..9d3976733 100644
--- a/bin/site-specific-install.sh
+++ b/bin/site-specific-install.sh
@@ -1,5 +1,8 @@
#!/bin/sh
+# Set this to the version we want to check out
+VERSION=v1.1
+
PARENT_SCRIPT_URL=https://github.com/mysociety/commonlib/blob/master/bin/install-site.sh
misuse() {
@@ -25,6 +28,9 @@ misuse() {
install_nginx
+# Check out the current released version
+(cd "$REPOSITORY" && su -l -c "git checkout '$VERSION'" "$UNIX_USER")
+
install_website_packages
su -l -c "touch '$DIRECTORY/admin-htpasswd'" "$UNIX_USER"