aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Longair <mhl@pobox.com>2012-10-04 17:03:29 +0100
committerMark Longair <mhl@pobox.com>2012-10-04 17:03:29 +0100
commitec9436c172c88503a4a8363ab314680c6db4620a (patch)
tree32920efa44bc48d3f1ac6b045162716235787a93
parent00b1e242cab3e194f8252b117e1218a78ebf592b (diff)
Revert "Generate .po files before installing Perl modules"
This reverts commit 61bfbbe92a3225869520dbcb32f35069431fa84e. In fact, the Perl modules are required by the .po generating scripts, so we can't do this reordering.
-rwxr-xr-xbin/install-as-user10
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/install-as-user b/bin/install-as-user
index 46dbcb65e..a4d656cf5 100755
--- a/bin/install-as-user
+++ b/bin/install-as-user
@@ -98,14 +98,14 @@ then
psql -U "$UNIX_USER" "$DB_NAME" < "$REPOSITORY"/db/generate_secret.sql
fi
+# Install the required Perl modules - this may take a very long time:
+
+cd "$FMS_REPOSITORY"
+bin/install_perl_modules
+
# Generate po and mo files (these invocations taken from Kagee's script):
bin/cron-wrapper bin/make_emptyhomes_po
bin/cron-wrapper bin/make_emptyhomes_welsh_po
commonlib/bin/gettext-makemo FixMyStreet
-
-# Install the required Perl modules - this may take a very long time:
-
-cd "$FMS_REPOSITORY"
-bin/install_perl_modules