Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/aws-cli/devcontainer-feature.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "AWS CLI (RHEL)",
"id": "aws-cli",
"version": "1.0.2",
"version": "1.0.3",
"description": "Installs the AWS CLI along with needed dependencies. Best-efforts a dnf install.",
"documentationURL": "https://github.com/faangbait/dnf-features/tree/main/src/aws-cli",
"options": {
Expand Down
13 changes: 5 additions & 8 deletions src/aws-cli/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

set -e

AWS_CLI_VERSION=${VERSION:-"latest"}
VERSION=${VERSION:-"latest"}
VERBOSE=${VERBOSE:-"true"}

AWSCLI_GPG_KEY=FB5DB77FD5C118B80511ADA8A6310ACC4672475C
Expand Down Expand Up @@ -195,8 +195,8 @@ install() {
local scriptSigFile=awscli.sig

# See Linux install docs at https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html
if [ "${AWS_CLI_VERSION}" != "latest" ]; then
local versionStr=-${AWS_CLI_VERSION}
if [ "${VERSION}" != "latest" ]; then
local versionStr=-${VERSION}
fi
# Detect architecture without relying on dpkg (works on Alpine and non-debian systems)
arch=$(uname -m)
Expand Down Expand Up @@ -227,11 +227,11 @@ install() {

# AWS bash completion
mkdir -p /etc/bash_completion.d
cp ./aws_bash_completer /etc/bash_completion.d/aws
cp ./scripts/vendor/aws_bash_completer /etc/bash_completion.d/aws

# AWS zsh completion
mkdir -p /usr/local/share/zsh/site-functions/
cp ./aws_zsh_completer.sh /usr/local/share/zsh/site-functions/_aws
cp ./scripts/vendor/aws_zsh_completer.sh /usr/local/share/zsh/site-functions/_aws
sed -i '1s/^/#compdef aws\n/' /usr/local/share/zsh/site-functions/_aws

rm -rf ./aws
Expand All @@ -241,7 +241,4 @@ echo "(*) Installing AWS CLI..."

install

# Clean up
rm -rf /var/lib/apt/lists/*

echo "Done!"
Loading