diff options
author | James Mills <1290234+prologic@users.noreply.github.com> | 2020-01-28 05:52:14 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-28 05:52:14 +1000 |
commit | a4223457b49497f57bd199dfaf5cf35c4fb86997 (patch) | |
tree | 1c69d87f1441820b71d1713e56ef1559dae90df1 /packaging/makeself | |
parent | f8d3b2cb46bb608a3a80c3d00b57cae38eae3d6c (diff) |
Fixes and improves the installer/updater shell scripts. (#7847)
* Auto-formatted the installer/updater shell scripts
* Fixed shellcheck problems founds for installer/updater shell scripts
* Update netdata-installer.sh
Co-Authored-By: Konstantinos Natsakis <5933427+knatsakis@users.noreply.github.com>
* Update packaging/installer/kickstart-static64.sh
Co-Authored-By: Konstantinos Natsakis <5933427+knatsakis@users.noreply.github.com>
* Update packaging/makeself/install-or-update.sh
Co-Authored-By: Konstantinos Natsakis <5933427+knatsakis@users.noreply.github.com>
* Updated md5sum of kickstart-static64.sh in docs
* Fixed bad rebase/merge conflicts
Co-authored-by: Konstantinos Natsakis <5933427+knatsakis@users.noreply.github.com>
Diffstat (limited to 'packaging/makeself')
-rwxr-xr-x | packaging/makeself/install-or-update.sh | 299 |
1 files changed, 142 insertions, 157 deletions
diff --git a/packaging/makeself/install-or-update.sh b/packaging/makeself/install-or-update.sh index 330cfc5798..4791ea2e92 100755 --- a/packaging/makeself/install-or-update.sh +++ b/packaging/makeself/install-or-update.sh @@ -1,26 +1,28 @@ #!/usr/bin/env bash + # SPDX-License-Identifier: GPL-3.0-or-later -. $(dirname "${0}")/functions.sh +# shellcheck source=./packaging/makeself/functions.sh +. "$(dirname "${0}")"/functions.sh export LC_ALL=C umask 002 # Be nice on production environments -renice 19 $$ >/dev/null 2>/dev/null +renice 19 $$ > /dev/null 2> /dev/null NETDATA_PREFIX="/opt/netdata" NETDATA_USER_CONFIG_DIR="${NETDATA_PREFIX}/etc/netdata" # ----------------------------------------------------------------------------- if [ -d /opt/netdata/etc/netdata.old ]; then - progress "Found old etc/netdata directory, reinstating this" - [ -d /opt/netdata/etc/netdata.new ] && rm -rf /opt/netdata/etc/netdata.new - mv -f /opt/netdata/etc/netdata /opt/netdata/etc/netdata.new - mv -f /opt/netdata/etc/netdata.old /opt/netdata/etc/netdata + progress "Found old etc/netdata directory, reinstating this" + [ -d /opt/netdata/etc/netdata.new ] && rm -rf /opt/netdata/etc/netdata.new + mv -f /opt/netdata/etc/netdata /opt/netdata/etc/netdata.new + mv -f /opt/netdata/etc/netdata.old /opt/netdata/etc/netdata - progress "Trigger stock config clean up" - rm -f /opt/netdata/etc/netdata/.installer-cleanup-of-stock-configs-done + progress "Trigger stock config clean up" + rm -f /opt/netdata/etc/netdata/.installer-cleanup-of-stock-configs-done fi STARTIT=1 @@ -29,75 +31,69 @@ REINSTALL_OPTIONS="" RELEASE_CHANNEL="nightly" # check .travis/create_artifacts.sh before modifying while [ "${1}" ]; do - case "${1}" in - "--dont-start-it") - STARTIT=0 - REINSTALL_OPTIONS="${REINSTALL_OPTIONS} ${1}" - ;; - "--auto-update"|"-u") - AUTOUPDATE=1 - REINSTALL_OPTIONS="${REINSTALL_OPTIONS} ${1}" - ;; - "--stable-channel") - RELEASE_CHANNEL="stable" - REINSTALL_OPTIONS="${REINSTALL_OPTIONS} ${1}" - ;; - "--nightly-channel") - RELEASE_CHANNEL="nightly" - REINSTALL_OPTIONS="${REINSTALL_OPTIONS} ${1}" - ;; - "--disable-telemetry") - DISABLE_TELEMETRY=1 - REINSTALL_OPTIONS="${REINSTALL_OPTIONS} ${1}" - ;; - - *) echo >&2 "Unknown option '${1}'. Ignoring it.";; - esac - shift 1 + case "${1}" in + "--dont-start-it") + STARTIT=0 + REINSTALL_OPTIONS="${REINSTALL_OPTIONS} ${1}" + ;; + "--auto-update" | "-u") + AUTOUPDATE=1 + REINSTALL_OPTIONS="${REINSTALL_OPTIONS} ${1}" + ;; + "--stable-channel") + RELEASE_CHANNEL="stable" + REINSTALL_OPTIONS="${REINSTALL_OPTIONS} ${1}" + ;; + "--nightly-channel") + RELEASE_CHANNEL="nightly" + REINSTALL_OPTIONS="${REINSTALL_OPTIONS} ${1}" + ;; + "--disable-telemetry") + REINSTALL_OPTIONS="${REINSTALL_OPTIONS} ${1}" + ;; + + *) echo >&2 "Unknown option '${1}'. Ignoring it." ;; + esac + shift 1 done deleted_stock_configs=0 -if [ ! -f "etc/netdata/.installer-cleanup-of-stock-configs-done" ] -then - - # ----------------------------------------------------------------------------- - progress "Deleting stock configuration files from user configuration directory" - - declare -A configs_signatures=() - source "system/configs.signatures" - - if [ ! -d etc/netdata ] - then - run mkdir -p etc/netdata +if [ ! -f "etc/netdata/.installer-cleanup-of-stock-configs-done" ]; then + + # ----------------------------------------------------------------------------- + progress "Deleting stock configuration files from user configuration directory" + + declare -A configs_signatures=() + source "system/configs.signatures" + + if [ ! -d etc/netdata ]; then + run mkdir -p etc/netdata + fi + + md5sum="$(command -v md5sum 2> /dev/null || command -v md5 2> /dev/null)" + while IFS= read -r -d '' x; do + # find it relative filename + f="${x/etc\/netdata\//}" + + # find the stock filename + t="${f/.conf.old/.conf}" + t="${t/.conf.orig/.conf}" + + if [ -n "${md5sum}" ]; then + # find the checksum of the existing file + md5="$(${md5sum} < "${x}" | cut -d ' ' -f 1)" + #echo >&2 "md5: ${md5}" + + # check if it matches + if [ "${configs_signatures[${md5}]}" = "${t}" ]; then + # it matches the default + run rm -f "${x}" + deleted_stock_configs=$((deleted_stock_configs + 1)) + fi fi + done < <(find etc -type f) - md5sum="$(which md5sum 2>/dev/null || command -v md5sum 2>/dev/null || command -v md5 2>/dev/null)" - for x in $(find etc -type f) - do - # find it relative filename - f="${x/etc\/netdata\//}" - - # find the stock filename - t="${f/.conf.old/.conf}" - t="${t/.conf.orig/.conf}" - - if [ ! -z "${md5sum}" ] - then - # find the checksum of the existing file - md5="$( ${md5sum} <"${x}" | cut -d ' ' -f 1)" - #echo >&2 "md5: ${md5}" - - # check if it matches - if [ "${configs_signatures[${md5}]}" = "${t}" ] - then - # it matches the default - run rm -f "${x}" - deleted_stock_configs=$(( deleted_stock_configs + 1 )) - fi - fi - done - - touch "etc/netdata/.installer-cleanup-of-stock-configs-done" + touch "etc/netdata/.installer-cleanup-of-stock-configs-done" fi # ----------------------------------------------------------------------------- @@ -110,44 +106,44 @@ NETDATA_USER="root" NETDATA_GROUP="root" if portable_add_group netdata; then - if portable_add_user netdata "/opt/netdata"; then - progress "Add user netdata to required user groups" - for g in ${NETDATA_WANTED_GROUPS}; do - # shellcheck disable=SC2086 - portable_add_user_to_group ${g} netdata && NETDATA_ADDED_TO_GROUPS="${NETDATA_ADDED_TO_GROUPS} ${g}" || run_failed "Failed to add netdata user to secondary groups" - done - NETDATA_USER="netdata" - NETDATA_GROUP="netdata" - else - run_failed "I could not add user netdata, will be using root" - fi + if portable_add_user netdata "/opt/netdata"; then + progress "Add user netdata to required user groups" + for g in ${NETDATA_WANTED_GROUPS}; do + # shellcheck disable=SC2086 + if portable_add_user_to_group ${g} netdata; then + NETDATA_ADDED_TO_GROUPS="${NETDATA_ADDED_TO_GROUPS} ${g}" + else + run_failed "Failed to add netdata user to secondary groups" + fi + done + NETDATA_USER="netdata" + NETDATA_GROUP="netdata" + else + run_failed "I could not add user netdata, will be using root" + fi else - run_failed "I could not add group netdata, so no user netdata will be created as well. Netdata run as root:root" + run_failed "I could not add group netdata, so no user netdata will be created as well. Netdata run as root:root" fi # ----------------------------------------------------------------------------- progress "Check SSL certificates paths" -if [ ! -f "/etc/ssl/certs/ca-certificates.crt" ] -then - if [ ! -f /opt/netdata/.curlrc ] - then - cacert= - - # CentOS - [ -f "/etc/ssl/certs/ca-bundle.crt" ] && cacert="/etc/ssl/certs/ca-bundle.crt" - - if [ ! -z "${cacert}" ] - then - echo "Creating /opt/netdata/.curlrc with cacert=${cacert}" - echo >/opt/netdata/.curlrc "cacert=${cacert}" - else - run_failed "Failed to find /etc/ssl/certs/ca-certificates.crt" - fi +if [ ! -f "/etc/ssl/certs/ca-certificates.crt" ]; then + if [ ! -f /opt/netdata/.curlrc ]; then + cacert= + + # CentOS + [ -f "/etc/ssl/certs/ca-bundle.crt" ] && cacert="/etc/ssl/certs/ca-bundle.crt" + + if [ -n "${cacert}" ]; then + echo "Creating /opt/netdata/.curlrc with cacert=${cacert}" + echo > /opt/netdata/.curlrc "cacert=${cacert}" + else + run_failed "Failed to find /etc/ssl/certs/ca-certificates.crt" fi + fi fi - # ----------------------------------------------------------------------------- progress "Install logrotate configuration for netdata" @@ -160,7 +156,7 @@ progress "Telemetry configuration" if [ -n "${NETDATA_DISABLE_TELEMETRY+x}" ]; then run touch "${NETDATA_USER_CONFIG_DIR}/.opt-out-from-anonymous-statistics" else - printf "You can opt out from anonymous statistics via the --disable-telemetry option, or by creating an empty file ${NETDATA_USER_CONFIG_DIR}/.opt-out-from-anonymous-statistics \n\n" + printf "You can opt out from anonymous statistics via the --disable-telemetry option, or by creating an empty file %s \n\n" "${NETDATA_USER_CONFIG_DIR}/.opt-out-from-anonymous-statistics" fi # ----------------------------------------------------------------------------- @@ -168,10 +164,8 @@ progress "Install netdata at system init" install_netdata_service || run_failed "Cannot install netdata init service." - set_netdata_updater_channel || run_failed "Cannot set netdata updater tool release channel to '${RELEASE_CHANNEL}'" - # ----------------------------------------------------------------------------- progress "Install (but not enable) netdata updater tool" cleanup_old_netdata_updater || run_failed "Cannot cleanup old netdata updater tool." @@ -179,82 +173,73 @@ install_netdata_updater || run_failed "Cannot install netdata updater tool." progress "Check if we must enable/disable the netdata updater tool" if [ "${AUTOUPDATE}" = "1" ]; then - enable_netdata_updater || run_failed "Cannot enable netdata updater tool" + enable_netdata_updater || run_failed "Cannot enable netdata updater tool" else - disable_netdata_updater || run_failed "Cannot disable netdata updater tool" + disable_netdata_updater || run_failed "Cannot disable netdata updater tool" fi - # ----------------------------------------------------------------------------- progress "creating quick links" dir_should_be_link() { - local p="${1}" t="${2}" d="${3}" old - - old="${PWD}" - cd "${p}" || return 0 - - if [ -e "${d}" ] - then - if [ -h "${d}" ] - then - run rm "${d}" - else - run mv -f "${d}" "${d}.old.$$" - fi + local p="${1}" t="${2}" d="${3}" old + + old="${PWD}" + cd "${p}" || return 0 + + if [ -e "${d}" ]; then + if [ -h "${d}" ]; then + run rm "${d}" + else + run mv -f "${d}" "${d}.old.$$" fi + fi - run ln -s "${t}" "${d}" - cd "${old}" + run ln -s "${t}" "${d}" + cd "${old}" } -dir_should_be_link . bin sbin +dir_should_be_link . bin sbin dir_should_be_link usr ../bin bin dir_should_be_link usr ../bin sbin -dir_should_be_link usr . local +dir_should_be_link usr . local -dir_should_be_link . etc/netdata netdata-configs +dir_should_be_link . etc/netdata netdata-configs dir_should_be_link . usr/share/netdata/web netdata-web-files -dir_should_be_link . usr/libexec/netdata netdata-plugins -dir_should_be_link . var/lib/netdata netdata-dbs -dir_should_be_link . var/cache/netdata netdata-metrics -dir_should_be_link . var/log/netdata netdata-logs +dir_should_be_link . usr/libexec/netdata netdata-plugins +dir_should_be_link . var/lib/netdata netdata-dbs +dir_should_be_link . var/cache/netdata netdata-metrics +dir_should_be_link . var/log/netdata netdata-logs dir_should_be_link etc/netdata ../../usr/lib/netdata/conf.d orig -if [ ${deleted_stock_configs} -gt 0 ] -then - dir_should_be_link etc/netdata ../../usr/lib/netdata/conf.d "000.-.USE.THE.orig.LINK.TO.COPY.AND.EDIT.STOCK.CONFIG.FILES" +if [ ${deleted_stock_configs} -gt 0 ]; then + dir_should_be_link etc/netdata ../../usr/lib/netdata/conf.d "000.-.USE.THE.orig.LINK.TO.COPY.AND.EDIT.STOCK.CONFIG.FILES" fi - # ----------------------------------------------------------------------------- progress "fix permissions" run chmod g+rx,o+rx /opt run chown -R ${NETDATA_USER}:${NETDATA_GROUP} /opt/netdata - # ----------------------------------------------------------------------------- progress "fix plugin permissions" -for x in apps.plugin freeipmi.plugin ioping cgroup-network -do - f="usr/libexec/netdata/plugins.d/${x}" +for x in apps.plugin freeipmi.plugin ioping cgroup-network; do + f="usr/libexec/netdata/plugins.d/${x}" - if [ -f "${f}" ] - then - run chown root:${NETDATA_GROUP} "${f}" - run chmod 4750 "${f}" - fi + if [ -f "${f}" ]; then + run chown root:${NETDATA_GROUP} "${f}" + run chmod 4750 "${f}" + fi done # fix the fping binary -if [ -f bin/fping ] -then - run chown root:${NETDATA_GROUP} bin/fping - run chmod 4750 bin/fping +if [ -f bin/fping ]; then + run chown root:${NETDATA_GROUP} bin/fping + run chmod 4750 bin/fping fi # ----------------------------------------------------------------------------- @@ -265,17 +250,17 @@ sed -i "s/REINSTALL_OPTIONS=\".*\"/REINSTALL_OPTIONS=\"${REINSTALL_OPTIONS}\"/" # ----------------------------------------------------------------------------- if [ ${STARTIT} -eq 0 ]; then - create_netdata_conf "${NETDATA_PREFIX}/etc/netdata/netdata.conf" - netdata_banner "is installed now!" + create_netdata_conf "${NETDATA_PREFIX}/etc/netdata/netdata.conf" + netdata_banner "is installed now!" else - progress "starting netdata" - - if ! restart_netdata "${NETDATA_PREFIX}/bin/netdata"; then - create_netdata_conf "${NETDATA_PREFIX}/etc/netdata/netdata.conf" - netdata_banner "is installed and running now!" - else - create_netdata_conf "${NETDATA_PREFIX}/etc/netdata/netdata.conf" "http://localhost:19999/netdata.conf" - netdata_banner "is installed now!" - fi + progress "starting netdata" + + if ! restart_netdata "${NETDATA_PREFIX}/bin/netdata"; then + create_netdata_conf "${NETDATA_PREFIX}/etc/netdata/netdata.conf" + netdata_banner "is installed and running now!" + else + create_netdata_conf "${NETDATA_PREFIX}/etc/netdata/netdata.conf" "http://localhost:19999/netdata.conf" + netdata_banner "is installed now!" + fi fi run chmod 0644 "${NETDATA_PREFIX}/etc/netdata/netdata.conf" |