Merge branch '2079-check-latest-deploy'

1 files changed, 15 insertions, 4 deletions

diff --git a/setenv.pl b/setenv.pl
index f1e9cf53b..52d386cc6 100755
--- a/setenv.pl
+++ b/setenv.pl
@@ -6,9 +6,20 @@ use warnings;
 my $root;
 
 BEGIN {
-    use File::Basename qw(dirname);
-    use File::Spec;
-    $root = dirname(File::Spec->rel2abs(__FILE__));
+    use Cwd qw(abs_path);
+    use File::Basename qw(dirname basename);
+    $root = dirname(abs_path(__FILE__));
+}
+
+# Check there is not a later timestamped deploy, if running in such a system
+
+if ($root =~ /fixmystreet-\d\d\d\d-\d\d-\d\dT\d\d-\d\d-\d\d$/) {
+    my @deploys = sort map { basename $_ } glob("$root/../fixmystreet-*");
+    if (basename($root) ne $deploys[-1] && !$ENV{OLD_DEPLOY_ACKNOWLEDGED}) {
+        require Term::ANSIColor;
+        print Term::ANSIColor::colored("NOT THE LATEST DEPLOY; ABORTING\n", 'red');
+        exit 1;
+    }
 }
 
 # Set the environment for the FixMyStreet project
@@ -68,7 +79,7 @@ else {
 
     my @modules =
       sort
-      grep { m/File::/ }
+      grep { m/Cwd|File::(?!Glob)/ }
       map { s{\.pm$}{}; s{/}{::}g; $_ }
       grep { m{\.pm$} }
       keys %INC;