Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shell arg fix #380

Merged
merged 11 commits into from
Aug 10, 2021
Merged

Shell arg fix #380

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
01fe0ea
:bug: Fixes shell arguments being passed twice to aws command
hcourse-nydig Aug 4, 2021
998ecd2
Fix profile issues for okta-aws and okta-sls
DavidTanner Aug 4, 2021
b9036d9
changing oktadeveloper to oktadev
Aug 4, 2021
8d3cefb
Merge pull request #1 from dangeReis/update-repo-name
dangeReis Aug 4, 2021
65f1b16
Merge pull request #2 from hcourse-nydig/shell-arg-fix
dangeReis Aug 4, 2021
d6d103f
Merge branch 'updateInstallScripts' of https://github.com/DavidTanner…
Aug 4, 2021
49a3424
Merge branch 'DavidTanner-updateInstallScripts' into shell-arg-fix
Aug 4, 2021
03b2819
make grep for the location tag case insensitive
Aug 4, 2021
1206e61
Merge branch 'oktadev:master' into shell-arg-fix
dangeReis Aug 4, 2021
6cd0a81
fixing fish
Aug 4, 2021
67909b3
Merge branch 'shell-arg-fix' of github.com:dangeReis/okta-aws-cli-ass…
Aug 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions bin/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ PREFIX="$(cd -P -- "${PREFIX}" && pwd)"
echo "Installing into ${PREFIX}" | sed "s#$HOME#~#g"

mkdir -p ${PREFIX}
releaseUrl=$(curl -sLI ${repo_url}/releases/latest | grep -e "location:.*tag" | cut -c11-)
releaseUrl=$(curl -sLI ${repo_url}/releases/latest | grep -ie "location:.*tag" | cut -c11-)
releaseTag=$(echo $releaseUrl | awk 'BEGIN{FS="/"}{print $8}' | tr -d '\r')
url=${repo_url}/releases/download/${releaseTag}/okta-aws-cli-${releaseTag:1}.jar
dest=${PREFIX}/$(basename ${url})
Expand All @@ -98,10 +98,10 @@ if ! grep '^#OktaAWSCLI' "${bash_functions}" &>/dev/null; then
cat <<'EOF' >>"${bash_functions}"
#OktaAWSCLI
function okta-aws {
withokta "aws --profile $1" "$@"
OKTA_PROFILE="$1" withokta "aws --profile $1" "${@:2}"
}
function okta-sls {
withokta "sls --stage $1" "$@"
OKTA_PROFILE="$1" withokta "sls --stage $1" "${@:2}"
}
EOF
fi
Expand All @@ -111,12 +111,14 @@ fishFunctionsDir="${PREFIX}/fish_functions"
mkdir -p "${fishFunctionsDir}"
cat <<'EOF' >"${fishFunctionsDir}/okta-aws.fish"
function okta-aws
withokta "aws --profile $argv[1]" $argv
set -lx OKTA_PROFILE "$argv[1]"
withokta "aws --profile $argv[1]" $argv[2..-1]
end
EOF
cat <<'EOF' >"${fishFunctionsDir}/okta-sls.fish"
function okta-sls
withokta "sls --stage $argv[1]" $argv
set -lx OKTA_PROFILE "$argv[1]"
withokta "sls --stage $argv[1]" $argv[2..-1]
end
EOF

Expand Down