From: Tom Clegg <tom@clinicalfuture.com>
Date: Tue, 17 Sep 2013 01:59:04 +0000 (-0400)
Subject: During task setup, if it exists, run /crunch_scripts/install instead
X-Git-Tag: 1.1.0~3017
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/ef71d0cab582ed90fea0edc9ea2ed94a22946086

During task setup, if it exists, run /crunch_scripts/install instead
of /install.sh
---

diff --git a/services/crunch/crunch-job b/services/crunch/crunch-job
index 2dcd0f03d5..10acb8cbbe 100755
--- a/services/crunch/crunch-job
+++ b/services/crunch/crunch-job
@@ -1330,7 +1330,9 @@ my $pwd;
 chomp ($pwd = `pwd`);
 my $install_dir = $ENV{"CRUNCH_INSTALL"} || "$pwd/opt";
 mkdir $install_dir;
-if (!-e "./install.sh" && -e "./tests/autotests.sh") {
+if (-e "$destdir/crunch_scripts/install") {
+    shell_or_die ("$destdir/crunch_scripts/install", $install_dir);
+} elsif (!-e "./install.sh" && -e "./tests/autotests.sh") {
     # Old version
     shell_or_die ("./tests/autotests.sh", $install_dir);
 } elsif (-e "./install.sh") {