frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

Revert "Moving to whoami fixes ambiguity on a multi-user system"

Browse Source 
This reverts commit 18f615f08c.
This commit is contained in:
Ben Nealon 2019-08-10 11:30:08 +01:00
parent 18f615f08c
commit cc538b60fd
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/debian/postinst
View File

@ -29,7 +29,7 @@ BOOT_BERRYBOOT=$(grep -m1 -c '\(/var/media\|/media/pi\)/berryboot' /etc/mtab)
NET_IP=`hostname -I | cut -d " " -f1` NET_IP=`hostname -I | cut -d " " -f1`
# search for users in system, returns first entry # search for users in system, returns first entry
FOUND_USR=`whoami` || "root" FOUND_USR=`who | grep -o -m1 '^\w*\b'` || "root"
# determine if we should use a service # determine if we should use a service
ENABLE_SERVICE=0 ENABLE_SERVICE=0

2
cmake/debian/preinst
View File

@ -3,7 +3,7 @@
echo "---Hyperion ambient light preinst ---" echo "---Hyperion ambient light preinst ---"
# search for users in system, returns first entry # search for users in system, returns first entry
FOUND_USR=`whoami` || "root" FOUND_USR=`who | grep -o -m1 '^\w*\b'` || "root"
# stop running daemon before we install # stop running daemon before we install
if pgrep hyperiond > /dev/null 2>&1 if pgrep hyperiond > /dev/null 2>&1

2
cmake/debian/prerm
View File

@ -3,7 +3,7 @@
echo "---Hyperion ambient light prerm ---" echo "---Hyperion ambient light prerm ---"
# search for users in system, returns first entry # search for users in system, returns first entry
FOUND_USR=`whoami` || "root" FOUND_USR=`who | grep -o -m1 '^\w*\b'` || "root"
# stop running daemon before we delete it # stop running daemon before we delete it
HYPERION_RUNNING=false HYPERION_RUNNING=false

2
cmake/rpm/postinst
View File

@ -29,7 +29,7 @@ BOOT_BERRYBOOT=$(grep -m1 -c '\(/var/media\|/media/pi\)/berryboot' /etc/mtab)
NET_IP=`hostname -I | cut -d " " -f1` NET_IP=`hostname -I | cut -d " " -f1`
# search for users in system, returns first entry # search for users in system, returns first entry
FOUND_USR=`whoami` || "root" FOUND_USR=`who | grep -o -m1 '^\w*\b'` || "root"
# determine if we should use a service # determine if we should use a service
ENABLE_SERVICE=0 ENABLE_SERVICE=0

2
cmake/rpm/preinst
View File

@ -3,7 +3,7 @@
echo "---Hyperion ambient light preinst ---" echo "---Hyperion ambient light preinst ---"
# search for users in system, returns first entry # search for users in system, returns first entry
FOUND_USR=`whoami` || "root" FOUND_USR=`who | grep -o -m1 '^\w*\b'` || "root"
# stop running daemon before we install # stop running daemon before we install
if pgrep hyperiond > /dev/null 2>&1 if pgrep hyperiond > /dev/null 2>&1

2
cmake/rpm/prerm
View File

@ -3,7 +3,7 @@
echo "---Hyperion ambient light prerm ---" echo "---Hyperion ambient light prerm ---"
# search for users in system, returns first entry # search for users in system, returns first entry
FOUND_USR=`whoami` || "root" FOUND_USR=`who | grep -o -m1 '^\w*\b'` || "root"
# stop running daemon before we delete it # stop running daemon before we delete it
HYPERION_RUNNING=false HYPERION_RUNNING=false