@cryptotaxi247 / netdata-1 / commits / 42a35bda0

fix path to updater file (#5209)

* fix path to updater file * pack updater into dist package

Paweł Krupa committed Jan 18, 2019 at 15:24 UTC 42a35bda093c620b15387beb92eb340e56aea8c5
2 files changed +7 -4
Makefile.am
+2 -1
@@ -70,10 +70,11 @@ dist_noinst_DATA= \
70 # should be proper init.d/openrc/systemd usable
71 dist_noinst_SCRIPTS= \
72 coverity-scan.sh \
73 + packaging/installer/netdata-updater.sh \
74 packaging/installer/kickstart.sh \
75 packaging/installer/kickstart-static64.sh \
75 - netdata-installer.sh \
76 packaging/installer/functions.sh \
77 + netdata-installer.sh \
78 docs/generator/buildhtml.sh \
79 docs/generator/buildyaml.sh \
80 docs/generator/checklinks.sh \
netdata-installer.sh
+5 -3
@@ -909,8 +909,6 @@ To start netdata run:
909
910
911 END
912 -echo >&2 "Uninstall script is located at: ${TPUT_RED}${TPUT_BOLD}./netdata-uninstaller.sh${TPUT_RESET}"
913 -
912
913 if [ "${AUTOUPDATE}" = "1" ]; then
914 if [ "${UID}" -ne "0" ]; then
@@ -928,7 +926,11 @@ if [ "${AUTOUPDATE}" = "1" ]; then
926 rm -f "${crondir}/netdata-updater.sh"
927 fi
928 progress "Installing new netdata-updater in cron"
931 - sed "s|THIS_SHOULD_BE_REPLACED_BY_INSTALLER_SCRIPT|${NETDATA_USER_CONFIG_DIR}/.environment|" ./packaging/installer/netdata-updater.sh > ${crondir}/netdata-updater
929 + if [ -f "${installer_dir}/packaging/installer/netdata-updater.sh" ]; then
930 + sed "s|THIS_SHOULD_BE_REPLACED_BY_INSTALLER_SCRIPT|${NETDATA_USER_CONFIG_DIR}/.environment|" "${installer_dir}/packaging/installer/netdata-updater.sh" > ${crondir}/netdata-updater || exit 1
931 + else
932 + sed "s|THIS_SHOULD_BE_REPLACED_BY_INSTALLER_SCRIPT|${NETDATA_USER_CONFIG_DIR}/.environment|" "${netdata_source_dir}/packaging/installer/netdata-updater.sh" > ${crondir}/netdata-updater || exit 1
933 + fi
934 chmod 0755 ${crondir}/netdata-updater
935 echo >&2 "Update script is located at ${TPUT_GREEN}${TPUT_BOLD}${crondir}/netdata-updater${TPUT_RESET}"
936 echo >&2