From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Mon, 28 Jul 2014 13:13:59 +0000 (-0400)
Subject: Set $CRUNCH_SRC correctly when running the Docker container.  refs #3370
X-Git-Tag: 1.1.0~2406
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/b34070ef0ed43062e1e923c8771237575dbb5fa7

Set $CRUNCH_SRC correctly when running the Docker container.  refs #3370
---

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 462b78c5f8..30f06b8cab 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -668,15 +668,13 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
           elsif ($env_key eq "TASK_KEEPMOUNT") {
             $command .= "--env=\QTASK_KEEPMOUNT=/keep\E ";
           }
-          elsif ($env_key eq "CRUNCH_SRC") {
-            $command .= "--env=\QCRUNCH_SRC=/tmp/crunch-src\E ";
-          }
           else {
             $command .= "--env=\Q$env_key=$env_val\E ";
           }
         }
       }
       $command .= "--env=\QCRUNCH_NODE_SLOTS=$ENV{CRUNCH_NODE_SLOTS}\E ";
+      $command .= "--env=\QCRUNCH_SRC=/tmp/crunch-src\E ";
       $command .= "\Q$docker_hash\E ";
       $command .= "stdbuf --output=0 --error=0 ";
       $command .= "/tmp/crunch-src/crunch_scripts/" . $Job->{"script"};