From 5565db50733e23a9753aaf2fe9fcc37f7ded1b28 Mon Sep 17 00:00:00 2001 From: Maryam Tahhan Date: Thu, 18 May 2017 11:42:24 +0100 Subject: userguide: update barometer build and install Update the userguide and the build scripts to only build on supported OSes and to check if collectd is already installed on the system. Change-Id: I87cab22a06f8c1104aae25027aedfa3e534c06b3 Signed-off-by: Maryam Tahhan --- systems/build_base_machine.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'systems/build_base_machine.sh') diff --git a/systems/build_base_machine.sh b/systems/build_base_machine.sh index f6f72b7a..7b877f57 100755 --- a/systems/build_base_machine.sh +++ b/systems/build_base_machine.sh @@ -46,14 +46,14 @@ then SUDO="sudo -E" fi -# If there is version specific dir available then set distro_dir to that -if [ -d "$OS_NAME/$VERSION_ID" ]; then - distro_dir="$OS_NAME/$VERSION_ID" -else - # Fallback - Default distro_dir = OS name - distro_dir="$OS_NAME" +if [ "$1" != "-f" ] && [ -d "/opt/collectd" ] || [ -d "/etc/collectd" ] +then + die "collectd is already installed on this system, if you wish to reinstall please rerun the script with a -f argument" fi +# If there is version specific dir available then set distro_dir to that +distro_dir="$OS_NAME/$VERSION_ID" + # build base system using OS specific scripts if [ -d "$distro_dir" ] && [ -e "$distro_dir/build_base_machine.sh" ]; then $SUDO $distro_dir/build_base_machine.sh || die "$distro_dir/build_base_machine.sh failed" -- cgit 1.2.3-korg