Merge pull request #4 from kwilczynski/bugfix/correct-eval-usage-unde…

…r-ash-shell Fix usage of eval under Ash shell in the Alpine image.
nordcloud · Dec 3, 2019 · d8f6671 · d8f6671
2 parents 13dc6e0 + adfedb1
commit d8f6671
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 28 deletions.
diff --git a/assume-role-arn.sh b/assume-role-arn.sh
@@ -32,8 +32,10 @@ fi
 ASSUME_ROLE_ARN="$ASSUME_ROLE_ARN $*"
 set -- "$ASSUME_ROLE_ARN"
 
-eval "$ASSUME_ROLE_ARN"
+eval "$($ASSUME_ROLE_ARN)"
 
-echo "::set-env name=AWS_ACCESS_KEY_ID::${AWS_ACCESS_KEY_ID}"
-echo "::set-env name=AWS_SECRET_ACCESS_KEY::${AWS_SECRET_ACCESS_KEY}"
-echo "::set-env name=AWS_SESSION_TOKEN::${AWS_SESSION_TOKEN}"
+if [ -n "$AWS_ACCESS_KEY_ID" ]; then
+    echo "::set-env name=AWS_ACCESS_KEY_ID::${AWS_ACCESS_KEY_ID}"
+    echo "::set-env name=AWS_SECRET_ACCESS_KEY::${AWS_SECRET_ACCESS_KEY}"
+    echo "::set-env name=AWS_SESSION_TOKEN::${AWS_SESSION_TOKEN}"
+fi
diff --git a/entrypoint.sh b/entrypoint.sh