Merge pull request #137 from kgalens/bugfix/issue-135-libz-ldpath

Copying shim to /usr/local/aws-cli (default cromwell path) to avoid s…

Author: wleepang

src/ecs-additions/ecs-additions-common.sh

@@ -8,7 +8,11 @@ cp /opt/ecs-additions/fetch_and_run.sh /usr/local/bin
 mv /opt/aws-cli/bin /opt/aws-cli/dist
 chmod a+x /opt/ecs-additions/awscli-shim.sh
 mkdir /opt/aws-cli/bin
-cp /opt/ecs-additions/awscli-shim.sh /opt/aws-cli/bin/aws
+cp /opt/ecs-additions/awscli-shim.sh /opt/aws-cli/bin/aws                  # Used in Nextflow
+
+# Remove current symlink
+rm -f /usr/local/aws-cli/v2/current/bin/aws
+cp /opt/ecs-additions/awscli-shim.sh /usr/local/aws-cli/v2/current/bin/aws # Used in Cromwell
 
 # add 4GB of swap space
 dd if=/dev/zero of=/swapfile bs=128M count=32

src/ecs-additions/fetch_and_run.sh

@@ -16,7 +16,6 @@
 # See below for usage instructions.
 
 #PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/aws-cli/v2/current/dist
 BASENAME="${0##*/}"
 AWS="/usr/local/aws-cli/v2/current/bin/aws"