From 9c8fd6fba9131ff7bb733bcda897be8d53b09ad0 Mon Sep 17 00:00:00 2001 From: David Newhall II Date: Fri, 31 May 2019 01:07:25 -0700 Subject: [PATCH] better upgrade support in packages. --- integrations/influxunifi/scripts/before-remove.sh | 4 ++++ integrations/influxunifi/scripts/build_linux_packages.sh | 2 ++ integrations/influxunifi/scripts/build_osx_package.sh | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/integrations/influxunifi/scripts/before-remove.sh b/integrations/influxunifi/scripts/before-remove.sh index a1d4895e..36ab63fe 100755 --- a/integrations/influxunifi/scripts/before-remove.sh +++ b/integrations/influxunifi/scripts/before-remove.sh @@ -2,5 +2,9 @@ # This file is used by rpm and deb packages. FPM use. +if [ "$1" = "upgrade" ] || [ "$1" = "1" ] ; then + exit 0 +fi + systemctl stop unifi-poller systemctl disable unifi-poller diff --git a/integrations/influxunifi/scripts/build_linux_packages.sh b/integrations/influxunifi/scripts/build_linux_packages.sh index 75cd5459..644804c8 100755 --- a/integrations/influxunifi/scripts/build_linux_packages.sh +++ b/integrations/influxunifi/scripts/build_linux_packages.sh @@ -20,6 +20,7 @@ fi echo "Building '${OUTPUT}' package." +# eh, don't change these. PREFIX= BINFIX=/usr @@ -37,6 +38,7 @@ mkdir -p package_build/lib/systemd/system sed "s#ExecStart.*#ExecStart=${BINFIX}/bin/${BINARY} --config=${PREFIX}/etc/${BINARY}/up.conf#" \ init/systemd/unifi-poller.service > package_build/lib/systemd/system/${BINARY}.service +# Make a package. fpm -s dir -t ${OUTPUT} \ --name ${BINARY} \ --version ${VERSION} \ diff --git a/integrations/influxunifi/scripts/build_osx_package.sh b/integrations/influxunifi/scripts/build_osx_package.sh index bb6a39b3..17e88f13 100755 --- a/integrations/influxunifi/scripts/build_osx_package.sh +++ b/integrations/influxunifi/scripts/build_osx_package.sh @@ -1,7 +1,7 @@ #!/bin/bash # This script builds a simple macos Installer pkg. Run by the Makefile. -# Use: `make osx` +# Use: `make osxpkg` OUTPUT=$1 BINARY=unifi-poller