From 5b0d1824e7a057d4e65d33a052c2c3d9e795b4c9 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Fri, 19 Dec 2014 14:11:08 +0000
Subject: Update UNIX_USER on installation setup of crontab.

Fixes #974.
---
 bin/install-as-user | 1 +
 1 file changed, 1 insertion(+)

(limited to 'bin/install-as-user')

diff --git a/bin/install-as-user b/bin/install-as-user
index ebff69ed2..ef97a41b3 100755
--- a/bin/install-as-user
+++ b/bin/install-as-user
@@ -65,6 +65,7 @@ if [ ! "$DEVELOPMENT_INSTALL" = true ]; then
     sed -i \
         -e 's,$FMS,'"$REPOSITORY,g" \
         -e 's,$LOCK_DIR,'"$DIRECTORY,g" \
+        -e 's,$UNIX_USER,'"$UNIX_USER,g" \
         "$TEMPORARY_CRONTAB"
     crontab $TEMPORARY_CRONTAB
     echo $DONE_MSG
-- 
cgit v1.2.3


From 2e8df1a5a6610c43e0c1bda15d018fa16738061b Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Mon, 19 Jan 2015 16:20:55 +0000
Subject: Tidy up of bin directory.

Remove some unneeded scripts, move others to cobrand-specific
directories.
---
 bin/install-as-user | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/install-as-user')

diff --git a/bin/install-as-user b/bin/install-as-user
index ef97a41b3..33a74c140 100755
--- a/bin/install-as-user
+++ b/bin/install-as-user
@@ -134,7 +134,7 @@ echo $DONE_MSG
 # Generate po and mo files (these invocations taken from Kagee's script):
 echo "Creating locale .mo files"
 bin/cron-wrapper bin/make_po FixMyStreet-EmptyHomes
-bin/cron-wrapper bin/make_emptyhomes_welsh_po
+bin/cron-wrapper bin/emptyhomes/make_welsh_po
 commonlib/bin/gettext-makemo FixMyStreet
 echo $DONE_MSG
 
-- 
cgit v1.2.3


From 8e6d48d5ee351594fc92f1e680ba4a2219ed57ca Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 15 Jan 2015 15:33:21 +0000
Subject: Remove need for cron-wrapper with existing scripts

Call the necessary boilerplate in each script so you can call them
directly. Remove boilerplate from files that don't need it.
---
 bin/install-as-user | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'bin/install-as-user')

diff --git a/bin/install-as-user b/bin/install-as-user
index 33a74c140..0e1c151fb 100755
--- a/bin/install-as-user
+++ b/bin/install-as-user
@@ -127,15 +127,15 @@ then
     psql -U "$UNIX_USER" "$DB_NAME" < "$REPOSITORY"/db/alert_types.sql
     psql -U "$UNIX_USER" "$DB_NAME" < "$REPOSITORY"/db/generate_secret.sql
 else
-    bin/cron-wrapper update-schema --commit
+    bin/update-schema --commit
 fi
 echo $DONE_MSG
 
 # Generate po and mo files (these invocations taken from Kagee's script):
 echo "Creating locale .mo files"
-bin/cron-wrapper bin/make_po FixMyStreet-EmptyHomes
-bin/cron-wrapper bin/emptyhomes/make_welsh_po
+bin/make_po FixMyStreet-EmptyHomes
+bin/emptyhomes/make_welsh_po
 commonlib/bin/gettext-makemo FixMyStreet
 echo $DONE_MSG
 
-bin/cron-wrapper update-all-reports
+bin/update-all-reports
-- 
cgit v1.2.3