From ab4fa88ad6d76b89208c3f1ba6307fe72b90cd61 Mon Sep 17 00:00:00 2001 From: Ben Nealon Date: Wed, 7 Aug 2019 15:10:51 +0100 Subject: [PATCH] Updating debian and rpm pre/make/post scripts to not be greedy. --- cmake/debian/preinst | 2 +- cmake/debian/prerm | 2 +- cmake/rpm/postinst | 2 +- cmake/rpm/preinst | 2 +- cmake/rpm/prerm | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/debian/preinst b/cmake/debian/preinst index e0107138..5559dca8 100644 --- a/cmake/debian/preinst +++ b/cmake/debian/preinst @@ -3,7 +3,7 @@ echo "---Hyperion ambient light preinst ---" # search for users in system, returns first entry -FOUND_USR=`who | grep -o '^\w*\b'` || "root" +FOUND_USR=`who | grep -o -m1 '^\w*\b'` || "root" # stop running daemon before we install if pgrep hyperiond > /dev/null 2>&1 diff --git a/cmake/debian/prerm b/cmake/debian/prerm index 388c79ae..ceb8c5a4 100644 --- a/cmake/debian/prerm +++ b/cmake/debian/prerm @@ -3,7 +3,7 @@ echo "---Hyperion ambient light prerm ---" # search for users in system, returns first entry -FOUND_USR=`who | grep -o '^\w*\b'` || "root" +FOUND_USR=`who | grep -o -m1 '^\w*\b'` || "root" # stop running daemon before we delete it HYPERION_RUNNING=false diff --git a/cmake/rpm/postinst b/cmake/rpm/postinst index eb9fa7ec..9c090cf1 100644 --- a/cmake/rpm/postinst +++ b/cmake/rpm/postinst @@ -29,7 +29,7 @@ BOOT_BERRYBOOT=$(grep -m1 -c '\(/var/media\|/media/pi\)/berryboot' /etc/mtab) NET_IP=`hostname -I | cut -d " " -f1` # search for users in system, returns first entry -FOUND_USR=`who | grep -o '^\w*\b'` || "root" +FOUND_USR=`who | grep -o -m1 '^\w*\b'` || "root" # determine if we should use a service ENABLE_SERVICE=0 diff --git a/cmake/rpm/preinst b/cmake/rpm/preinst index 3dbfdd2f..e891e82e 100644 --- a/cmake/rpm/preinst +++ b/cmake/rpm/preinst @@ -3,7 +3,7 @@ echo "---Hyperion ambient light preinst ---" # search for users in system, returns first entry -FOUND_USR=`who | grep -o '^\w*\b'` || "root" +FOUND_USR=`who | grep -o -m1 '^\w*\b'` || "root" # stop running daemon before we install if pgrep hyperiond > /dev/null 2>&1 diff --git a/cmake/rpm/prerm b/cmake/rpm/prerm index 388c79ae..ceb8c5a4 100644 --- a/cmake/rpm/prerm +++ b/cmake/rpm/prerm @@ -3,7 +3,7 @@ echo "---Hyperion ambient light prerm ---" # search for users in system, returns first entry -FOUND_USR=`who | grep -o '^\w*\b'` || "root" +FOUND_USR=`who | grep -o -m1 '^\w*\b'` || "root" # stop running daemon before we delete it HYPERION_RUNNING=false