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

Jump to bottom

update install script to better support non-PATH installations #1184

Merged
merged 10 commits into from
Aug 16, 2021
Merged

update install script to better support non-PATH installations #1184

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b1c84d3
install: support arm64 arch
williamboman Aug 14, 2021
52bb7d2
install: fail when unable to download tflint distribution
williamboman Aug 14, 2021
ff4699d
install: use full path of tflint executable to print version
williamboman Aug 14, 2021
67dc804
install: add TFLINT_INSTALL_NO_ROOT env to to opt-out from sudo
williamboman Aug 14, 2021
2801500
README: add -s to curl
williamboman Aug 14, 2021
db695ea
install: don't create backup
williamboman Aug 14, 2021
a80c763
check write permission instead of using TFLINT_INSTALL_NO_ROOT flag
williamboman Aug 15, 2021
afc9ece
don't pass any backup flag
williamboman Aug 15, 2021
002f8a8
actually check the correct path
williamboman Aug 15, 2021
5426608
Merge remote-tracking branch 'upstream/master' into install-script
williamboman Aug 15, 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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ TFLint is a framework and each feature is provided by plugins, the key features
Bash script (Linux):

```console
curl https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | bash
curl -s https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | bash
```

Homebrew (macOS):
Expand Down
10 changes: 6 additions & 4 deletions install_linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ processor=$(uname -m)

if [ "$processor" == "x86_64" ]; then
arch="amd64"
elif [ "$processor" == "arm64" ]; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you could submit this separately happy to merge it right away

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 #1185

arch="arm64"
else
arch="386"
fi
Expand Down Expand Up @@ -41,7 +43,7 @@ else
fi

echo "Downloading TFLint $version"
curl -L -o /tmp/tflint.zip "https://github.com/terraform-linters/tflint/releases/download/${version}/tflint_${os}.zip"
curl --fail --silent -L -o /tmp/tflint.zip "https://github.com/terraform-linters/tflint/releases/download/${version}/tflint_${os}.zip"
retVal=$?
if [ $retVal -ne 0 ]; then
echo "Failed to download tflint_${os}.zip"
Expand All @@ -68,13 +70,13 @@ else
dest="${TFLINT_INSTALL_PATH:-/usr/local/bin}/"
echo "Installing /tmp/tflint to ${dest}..."

if [[ "$(id -u)" == 0 ]]; then SUDO=""; else
if [[ "$(id -u)" == 0 ]] || [[ $TFLINT_INSTALL_NO_ROOT == 1 ]]; then SUDO=""; else
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like the script should just test whether it can access the directory as the non-root user and use sudo if not rather than adding an option

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call 👍 a80c763

SUDO="sudo";
fi


$SUDO mkdir -p "$dest"
$SUDO install -b -c -v /tmp/tflint "$dest"
$SUDO install --backup=none -c -v /tmp/tflint "$dest"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps scope creeping a but - but I suggest we change this to not create any backup, to avoid polluting the PATH. What happens now if you run the install script more than once is that you'll end up with a tflint and tflint~ (the backup) in in your install destination.

retVal=$?
if [ $retVal -ne 0 ]; then
echo "Failed to install tflint"
Expand All @@ -89,4 +91,4 @@ rm -f /tmp/tflint.zip /tmp/tflint

echo -e "\n\n===================================================="
echo "Current tflint version"
tflint -v
"${dest}/tflint" -v