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

kickstart: pass options to installer #7051

Merged
merged 5 commits into from
Oct 28, 2019
Merged

kickstart: pass options to installer #7051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
42142c7
kickstart: pass options to installer
oxplot Oct 10, 2019
678ebba
kickstart: passthrough --stable-channel in static64
oxplot Oct 10, 2019
320534f
kickstart: update checksums in readme
oxplot Oct 10, 2019
4262c7d
Revert "kickstart: passthrough --stable-channel in static64"
oxplot Oct 13, 2019
1c08674
Revert kickstart-static64 checksum update
oxplot Oct 13, 2019
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 packaging/installer/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ To learn more about the pros and cons of using *nightly* vs. *stable* releases,
Verify the integrity of the script with this:

```bash
[ "735e9966a4cf0187863e06a5282b34a7" = "$(curl -Ss https://my-netdata.io/kickstart.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID"
[ "0ae8dd3c4c9b976c4342c9fc09d9afae" = "$(curl -Ss https://my-netdata.io/kickstart.sh | md5sum | cut -d ' ' -f 1)" ] && echo "OK, VALID" || echo "FAILED, INVALID"
```

_It should print `OK, VALID` if the script is the one we ship._
Expand Down
3 changes: 2 additions & 1 deletion packaging/installer/kickstart.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ while [ -n "${1}" ]; do
shift 1
elif [ "${1}" = "--stable-channel" ]; then
RELEASE_CHANNEL="stable"
NETDATA_INSTALLER_OPTIONS="$NETDATA_INSTALLER_OPTIONS --stable-channel"
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you make this so that it doesn't add an extra space when $NETDATA_INSTALLER_OPTIONS is empty?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is harmless in bash and spaces are collapsed. I don't think it justifies the extra fluff. Also, https://github.com/netdata/netdata/blob/master/packaging/installer/kickstart-static64.sh#L193 seems to do the same.

shift 1
elif [ "${1}" = "--local-files" ]; then
shift 1
Expand Down Expand Up @@ -351,7 +352,7 @@ done

if [ "${INTERACTIVE}" = "0" ]; then
PACKAGES_INSTALLER_OPTIONS="--dont-wait --non-interactive ${PACKAGES_INSTALLER_OPTIONS}"
NETDATA_INSTALLER_OPTIONS="--dont-wait"
NETDATA_INSTALLER_OPTIONS="$NETDATA_INSTALLER_OPTIONS --dont-wait"
Copy link
Contributor

@knatsakis knatsakis Oct 10, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

The same here: could you make this so that it doesn't add an extra space when $NETDATA_INSTALLER_OPTIONS is empty?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

See my other comment

fi

TMPDIR=$(create_tmp_directory)
Expand Down