even more changes

Signed-off-by: Paulchen-Panther <Paulchen--Panter@gmx.net>
2025-03-01 10:33:28 +00:00 · 2018-12-28 18:12:45 +01:00
parent 3700566d10
commit 2a77f6f012
99 changed files with 2610 additions and 673 deletions
--- a/cmake/debian/postinst
+++ b/cmake/debian/postinst
@@ -6,6 +6,7 @@ install_file()
 	dest="$2"

 	if [ ! -e "$dest" ]
+	then
 		cp "$src" "${dest}"
 		return 1
 	else
@@ -15,10 +16,7 @@ install_file()
 }


-echo "--- hyperion ambient light postinstall ---"
-echo "- install configuration template"
-mkdir -p /etc/hyperion
-mkdir -p /usr/share/hyperion/custom-effects
+echo "---Hyperion ambient light postinstall ---"

 #check system
 CPU_RPI=`grep -m1 -c 'BCM2708\|BCM2709\|BCM2710\|BCM2835' /proc/cpuinfo`
@@ -27,25 +25,29 @@ CPU_X32X64=`uname -m | grep 'x86_32\|i686\|x86_64' | wc -l`
 #Check for a bootloader as Berryboot
 BOOT_BERRYBOOT=$(grep -m1 -c '\(/var/media\|/media/pi\)/berryboot' /etc/mtab)

-#get current system ip + add default port
-address=$(ip -o -4 a | awk '$2 == "eth0" { gsub(/\/.*/, "", $4); print $4 }')":8099"
+#get current system ip
+NET_IF=`netstat -rn | awk '/^0.0.0.0/ {thif=substr($0,74,10); print thif;} /^default.*UG/ {thif=substr($0,65,10); print thif;}'`
+NET_IP=`ifconfig ${NET_IF} | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1'`

 #check if hyperion is running
 HYPERION_RUNNING=false
 pgrep hyperiond > /dev/null 2>&1 && HYPERION_RUNNING=true

+# search for users in system, returns first entry
+FOUND_USR=`who | grep -o '^\w*\b'` || "root"
+
 start_msg=""
 restart_msg=""
-SERVICE_POSTFIX=""

 if grep -m1 systemd /proc/1/comm > /dev/null
 then
 	echo "--> init deamon: systemd"
 	# systemd
 	$HYPERION_RUNNING && systemctl stop hyperiond 2> /dev/null
-	install_file /usr/share/hyperion/service/hyperion.systemd /etc/systemd/system/hyperiond.service && systemctl -q enable hyperiond.service
-	start_msg="--> systemctl start hyperiond"
-	systemctl start hyperiond
+	install_file /usr/share/hyperion/service/hyperion.systemd /etc/systemd/system/hyperiond@.service
+	systemctl enable hyperiond"@${FOUND_USR}".service
+	start_msg="--> systemctl start hyperiond for user ${FOUND_USR}"
+	systemctl start hyperiond"@${FOUND_USR}"

 elif [ -e /sbin/initctl ]
 then
@@ -100,9 +102,12 @@ if [ $CPU_RPI -eq 1 ]; then
 	fi
 fi

+echo ${start_msg}
+
 echo "-----------------------------------------------------------------------------"
 echo "--> Hyperion has been installed/updated!"
-echo "--> For configuration, visit with your browser: ${address}"
+echo "--> For configuration, visit with your browser: ${NET_IP}:8090"
+echo "--> or if already used by another service try: ${NET_IP}:8091"
 $REBOOTMESSAGE
 echo "-----------------------------------------------------------------------------"
 echo "Webpage: www.hyperion-project.org"
@@ -110,28 +115,12 @@ echo "Wiki: wiki.hyperion-project.org"
 echo "Forum: forum.hyperion-project.org"
 echo "-----------------------------------------------------------------------------"

-# try to open the browser for desktops. TODO: add headless detection(?)
-if	[ $CPU_X32X64 -eq 1]
-echo "--> Will open browser with target: ${address}"
-	if [[ -e /usr/bin/xdg-open ]]
-		then
-		xdg-open http://"$address"
-	elif [[ -e /usr/bin/x-www-browser ]]
-		then
-		x-www-browser http://"$address"
-	elif [[ -e /usr/bin/www-browser ]]
-		then
-		www-browser http://"$address"
-	fi
-fi
-

 if [ -e /opt/hyperion/ ]
 then
 	echo
 	echo "---------------------------------------------------------------------------------"
-	echo "- It seemd that you have an older version of hyperion installed in /opt/hyerion -"
-	echo "- please remove it and check your config to avoid problems                      -"
+	echo "- It seemd that you have an older version of hyperion installed in /opt/hyperion -"
+	echo "- please remove it to avoid problems                                            -"
 	echo "---------------------------------------------------------------------------------"
 fi
-
--- a/cmake/debian/preinst
+++ b/cmake/debian/preinst
@@ -1,51 +1,56 @@
 #!/bin/sh

-# check which init script we should use
-USE_SYSTEMD=`grep -m1 -c systemd /proc/1/comm`
-USE_INITCTL=`which /sbin/initctl | wc -l`
-USE_SERVICE=`which /usr/sbin/service | wc -l`
+echo "---Hyperion ambient light preinst ---"

-#check for hyperion install
-if [ -d /usr/share/hyperion/bin ];then
-	if [ -e /etc/hyperion/hyperion.config.json ];then
-		file=`grep -m1 -c '"general"' /etc/hyperion/hyperion.config.json`
-		if [ $file -ne 1 ]; then
-			echo "--> It seems you are running an old version of Hyperion (1.X). Will create a backup at /usr/share/hyperion/Backup_Hyperion_1.0 and reset configuration / system service"
-		
-			# Stop hyperion daemon if it is running
-			echo '---> Stop Hyperion, if necessary'
-			if [ $USE_SYSTEMD -eq 1 ]; then
-				service hyperion stop 2>/dev/null
-			elif [ $USE_INITCTL -eq 1 ]; then
-				/sbin/initctl stop hyperion 2>/dev/null
-			elif [ $USE_SERVICE -eq 1 ]; then
-				/usr/sbin/service hyperion stop 2>/dev/null
-			fi
-		
-			#Backup
-			echo "--> Move old config(s) and files to /usr/share/hyperion/Backup_Hyperion_1.0"
-			mkdir  /usr/share/hyperion/Backup_Hyperion_1.0
-			mv /usr/share/hyperion /usr/share/hyperion/Backup_Hyperion_1.0
-			mv /etc/hyperion/* /usr/share/hyperion/Backup_Hyperion_1.0
+# search for users in system, returns first entry
+FOUND_USR=`who | grep -o '^\w*\b'` || "root"

-			#Disabling and delete service files
-			if [ $USE_SYSTEMD -eq 1 ]; then
-				# Delete and disable Hyperion systemd script
-				echo '---> Delete and disable Hyperion systemd service'
-				systemctl disable hyperion.service
-				rm -v /etc/systemd/system/hyperion* 2>/dev/null
-			elif [ $USE_INITCTL -eq 1 ]; then
-				echo '---> Delete and disable Hyperion initctl script'
-				rm -v /etc/init/hyperion* 2>/dev/null
-				initctl reload-configuration
-			elif [ $USE_SERVICE -eq 1 ]; then
-				# Delete and disable Hyperion init.d script
-				echo '---> Delete and disable Hyperion init.d script'
-				update-rc.d -f hyperion remove
-				rm /etc/init.d/hyperion* 2>/dev/null
-			fi
-		
-			echo "--> Hyperion 1.0 installation has been moved"
-		fi
+# stop running daemon before we install
+if pgrep hyperiond > /dev/null 2>&1
+then
+	if grep -m1 systemd /proc/1/comm > /dev/null
+	then
+		echo "--> stop init deamon: systemd"
+		# systemd
+		systemctl stop hyperiond"@${FOUND_USR}" 2> /dev/null
+
+	elif [ -e /sbin/initctl ]
+	then
+		echo "--> stop init deamon: upstart"
+		# upstart
+		initctl stop hyperiond
+
+	else
+		echo "--> stop init deamon: sysV"
+		# sysV
+		service hyperiond stop 2>/dev/null
 	fi
 fi
+
+
+#$USR=hyperionIS;
+
+#addToGroup()
+##{
+#	getent group $1 && adduser $USR $1;
+#}
+
+#check if user exists
+#if id $USR >/dev/null 2>&1; then
+#    echo "--> hyperion user exists, skip creation";
+#else
+	## create user
+#	echo "--> Create Hyperion user";
+#	adduser --system --group $USR;
+#fi
+
+# add user to groups if required
+## secondary user groups that are required to access system things
+#addToGroup(dialout);
+#addToGroup(video);
+#addToGroup(audio);
+#addToGroup(systemd-journal);
+# platform specific groups
+#addToGroup(i2c);
+#addToGroup(spi);
+#addToGroup(gpio);
--- a/cmake/debian/prerm
+++ b/cmake/debian/prerm
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+echo "---Hyperion ambient light prerm ---"
+
+# search for users in system, returns first entry
+FOUND_USR=`who | grep -o '^\w*\b'` || "root"
+
+# stop running daemon before we delete it
+HYPERION_RUNNING=false
+pgrep hyperiond > /dev/null 2>&1 && HYPERION_RUNNING=true
+
+if grep -m1 systemd /proc/1/comm > /dev/null
+then
+	echo "--> stop init deamon: systemd"
+	# systemd
+	$HYPERION_RUNNING && systemctl stop hyperiond"@${FOUND_USR}" 2> /dev/null
+	# disable user specific symlink
+	echo "--> Disable service and remove entry"
+	systemctl -q disable hyperiond"@${FOUND_USR}"
+	rm -v /etc/systemd/system/hyperiond@.service 2>/dev/null
+
+elif [ -e /sbin/initctl ]
+then
+	echo "--> stop init deamon: upstart"
+	# upstart
+	$HYPERION_RUNNING && initctl stop hyperiond
+	echo "--> Remove upstart service"
+	rm -v /etc/init/hyperion* 2>/dev/null
+	initctl reload-configuration
+
+else
+	echo "--> stop init deamon: sysV"
+	# sysV
+	$HYPERION_RUNNING && service hyperiond stop 2>/dev/null
+	echo "--> Remove sysV service"
+	update-rc.d -f hyperion remove
+	rm /etc/init.d/hyperion* 2>/dev/null
+fi
+
+return 0
--- a/cmake/packages.cmake
+++ b/cmake/packages.cmake
@@ -13,9 +13,9 @@ SET ( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE" )

 SET ( CPACK_DEBIAN_PACKAGE_MAINTAINER "Hyperion Team")
 SET ( CPACK_DEBIAN_PACKAGE_NAME "Hyperion" )
-SET ( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/preinst" )
+SET ( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/preinst;${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/prerm" )
 SET ( CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://www.hyperion-project.org" )
-SET ( CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5core5a (>= 5.2.0), libqt5network5 (>= 5.2.0), libqt5gui5 (>= 5.2.0), libqt5serialport5 (>= 5.2.0), libavahi-core7 (>= 0.6.31), libavahi-compat-libdnssd1 (>= 0.6.31), libusb-1.0-0, libpython3.4, libc6" )
+SET ( CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5core5a (>= 5.5.0), libqt5network5 (>= 5.5.0), libqt5gui5 (>= 5.5.0), libqt5serialport5 (>= 5.5.0), libqt5sql5 (>= 5.5.0), libavahi-core7 (>= 0.6.31), libavahi-compat-libdnssd1 (>= 0.6.31), libusb-1.0-0, libpython3.5, libc6" )
 SET ( CPACK_DEBIAN_PACKAGE_SECTION "Miscellaneous" )

 SET ( CPACK_RPM_PACKAGE_NAME "Hyperion" )