Merge branch 'v2025.xx.xx' into 3312-support-sensor-temperature-on-rpi-cameras-that-support-it

Author: EricClaeys

.github/workflows/ci_compile.yml

@@ -21,11 +21,8 @@ jobs:
       - uses: actions/checkout@v2
 
       # Runs a set of commands using the runners shell
-      - name: make deps
+      - name: make deps all
         run: |
-          sudo make deps
-
-      # Info: depends an step "make deps"
-      - name: make all
-        run: |
-          sudo make all
+          sudo apt update
+          sudo make -C src deps
+          make -C src all

Makefile

@@ -1,59 +1,26 @@
 platform = $(shell uname -m)
-prefix =
-
-sysconfdir = ${prefix}/etc
-exec_prefix = /usr
-bindir = ${exec_prefix}/bin
-libexecdir = ${exec_prefix}/libexec/allsky
-sharedir = ${exec_prefix}/share/allsky
 
 .DEFAULT_GOAL := all
 
 ROOTCHECK=$(shell id -u)
-ifneq ($(ROOTCHECK),0)
-  ifeq ($(PKGBUILD),1)
-    ROOTCHECK=0
-  endif
-endif
-
-ifeq ($(PKGBUILD),)
-  PKGBUILD=0
-endif
 
 %:
-	@make -C src $@
-	@make -C config_repo $@
-	@make -C notificationImages $@
-	@make -C scripts $@
+	@echo "Nothing to do for 'all'.  Run 'sudo make install' instead."
 
-deps:
-	@make -C src $@
-
-.PHONY : deps
 
-install:
 ifneq ($(ROOTCHECK), 0)
-	@echo This must be run with root permissions.
-	@echo Please run \'sudo make install\'
+install:
+	@echo "This must be run with root permissions."
+	@echo "Please run 'sudo make install'."
 else
+install:
 	@echo `date +%F\ %R:%S` Starting install...
+	@echo ""
 	@make -C src $@
+	@echo ""
 	@make -C config_repo $@
-	@make -C notificationImages $@
-	@make -C scripts $@
-	@if [ $(PKGBUILD) -eq 1 ]; then \
-	  [ ! -e $(DESTDIR)$(libexecdir) ] && mkdir -p $(DESTDIR)$(libexecdir) \
-	  install allsky.sh $(DESTDIR)$(libexecdir)/allsky.sh; \
-        fi
-	@if [ $(PKGBUILD) -ne 1 ]; then \
-	  echo `date +%F\ %R:%S` Setting directory permissions...; \
-	  [ ! -e tmp ] && mkdir tmp; \
-	  chown -R $(SUDO_USER):$(SUDO_USER) ./ ; \
-	  echo ""; \
-	  echo ""; \
-	  echo `date +%F\ %R:%S` Install complete; \
-	  echo ""; \
-	  echo ""; \
-	fi
+	@echo ""
+	@echo "\n\n`date +%F\ %R:%S` Install complete\n\n"
 endif
+
 .PHONY : install

allsky.sh

@@ -3,15 +3,24 @@
 [[ -z ${ALLSKY_HOME} ]] && export ALLSKY_HOME="$( realpath "$( dirname "${BASH_ARGV0}" )" )"
 ME="$( basename "${BASH_ARGV0}" )"
 
-# NOT_STARTED_MSG, STOPPED_MSG, ERROR_MSG_PREFIX, and ZWO_VENDOR are globals
-
 #shellcheck source-path=.
 source "${ALLSKY_HOME}/variables.sh"					|| exit "${EXIT_ERROR_STOP}"
+
+# If Allsky is already running, exit.  Let prior copy continue runnning.
+if [[ $( pgrep --count "${ME}" ) -gt 1 ]]; then
+	echo "     ***** Allsky already running; see below. Exiting new copy. *****" >&2
+	# Show other processes.  Don't show any newer than 5 seconds so we don't show ourself.
+	ps -f -p "$( pgrep --older 5 "${ME}" )"
+	exit "${EXIT_ERROR_STOP}"
+fi
+
 #shellcheck source-path=scripts
 source "${ALLSKY_SCRIPTS}/functions.sh"					|| exit "${EXIT_ERROR_STOP}"
 #shellcheck source-path=scripts
 source "${ALLSKY_SCRIPTS}/installUpgradeFunctions.sh"	|| exit "${EXIT_ERROR_STOP}"
 
+# NOT_STARTED_MSG, STOPPED_MSG, ERROR_MSG_PREFIX, and ZWO_VENDOR are globals
+
 # Output from this script goes either to the log file or a tty,
 # so can't use "w*" colors.
 
@@ -90,20 +99,37 @@ else
 	NEEDS_REBOOT="false"
 fi
 
-# Make sure the settings have been configured after an installation or upgrade.
 # If the "lastchanged" setting is missing, the user needs to review/change the settings.
+# This will happen after an installation or upgrade, which also sets the Allsky status.
 LAST_CHANGED="$( settings ".lastchanged" )"
 if [[ -z ${LAST_CHANGED} ]]; then
-	set_allsky_status "${ALLSKY_STATUS_NEEDS_CONFIGURATION}"
-	echo "*** ===== Allsky needs to be configured before it can be used.  See the WebUI." >&2
+	STATUS="$( get_allsky_status )"
+	if [[ ${STATUS} == "${ALLSKY_STATUS_NEEDS_REVIEW}" ]]; then
+		IMAGE_NAME="ReviewNeeded"
+		MSG="Please review the settings on the WebUI's 'Allsky Settings' page"
+		MSG+=" and make any necessary changes."
+		WEBUI_MSG="Allsky settings need review"
+
+	elif [[ ${STATUS} == "${ALLSKY_STATUS_NEEDS_CONFIGURATION}" ]]; then
+		IMAGE_NAME="ConfigurationNeeded"
+		MSG="Allsky needs to be configured before it can be used.  See the WebUI."
+		WEBUI_MSG="Allsky needs to be configured"
+
+	else
+		# I don't think we'll ever get here.
+		MSG="ERROR: Unknown reason 'lastchanged' did not exist."
+		WEBUI_MSG="${MSG}"
+		IMAGE_NAME=""
+	fi
 	if [[ ${NEEDS_REBOOT} == "true" ]]; then
-		echo "*** ===== The Pi also needs to be rebooted." >&2
-		doExit "${EXIT_ERROR_STOP}" "ConfigurationNeeded" \
-			"Allsky needs\nconfiguration\nand the Pi needs\na reboot" \
-			"Allsky needs to be configured and then the Pi rebooted."
+		MSG+=" The Pi also needs to be rebooted." >&2
+		doExit "${EXIT_ERROR_STOP}" "${IMAGE_NAME}" \
+			"" "${WEBUI_MSG} and then the Pi rebooted."
 	else
-		doExit "${EXIT_ERROR_STOP}" "ConfigurationNeeded" "" "Allsky needs to be configured."
+		doExit "${EXIT_ERROR_STOP}" "${IMAGE_NAME}" "" "${WEBUI_MSG}."
 	fi
+	echo "*** ===== ${MSG}" >&2		# to the log
+
 elif [[ ${NEEDS_REBOOT} == "true" ]]; then
 	set_allsky_status "${ALLSKY_STATUS_REBOOT_NEEDED}"
 	doExit "${EXIT_ERROR_STOP}" "RebootNeeded" "" "The Pi needs to be rebooted."
@@ -175,9 +201,6 @@ fi
 
 USE_NOTIFICATION_IMAGES="$( settings ".notificationimages" )"		|| exit "${EXIT_ERROR_STOP}"
 
-# Make sure we are not already running.
-pgrep "${ME}" | grep -v $$ | xargs "sudo kill -9" 2>/dev/null
-
 # Get the list of connected cameras and make sure the one we want is connected.
 if [[ ${CAMERA_TYPE} == "ZWO" ]]; then
 	RPi_COMMAND_TO_USE=""
@@ -222,9 +245,24 @@ if [[ ${CAMERA_TYPE} == "ZWO" ]]; then
 			"WARNING:\n\nResetting USB bus\n${REASON}.\nAttempt ${NUM_USB_RESETS}."
 
 		SEARCH="${ZWO_VENDOR}:${ZWO_CAMERA_ID}"
-		sudo "${ALLSKY_BIN}/uhubctl" --action off --exact --search "${SEARCH}"
+		# Get the hub number the camera is on.
+		local HUB="$( sudo "${ALLSKY_BIN}/uhubctl" --exact --search "${SEARCH}" |
+			gawk -v Z="${SEARCH}" '
+				BEGIN {hub = ""; }
+   				{
+					if ($4 == "hub") {
+						hub = $5;
+						next;
+					}
+					if (index($0, Z) > 0) {
+						print hub;
+						exit(0);
+					}
+				}'
+		)"
+		sudo "${ALLSKY_BIN}/uhubctl" --action off --exact --search "${SEARCH}" --location "${HUB}"
 		sleep 3		# give it a few seconds, plus, allow the notification images to be seen
-		sudo "${ALLSKY_BIN}/uhubctl" --action on --exact --search "${SEARCH}"
+		sudo "${ALLSKY_BIN}/uhubctl" --action on --exact --search "${SEARCH}" --location "${HUB}"
 	}
 
 else	# RPi

config_repo/Makefile

@@ -1,125 +1,83 @@
 platform = $(shell uname -m)
-prefix = 
-
-sysconfdir = ${prefix}/etc
-exec_prefix = /usr
-bindir = ${exec_prefix}/bin
-libexecdir = ${exec_prefix}/libexec/allsky
-sharedir = ${exec_prefix}/share/allsky
 
 HOMEDIR = $(shell dirname "$$PWD")
+CONFIGDIR = ${HOMEDIR}/config
 SCRIPTSDIR = ${HOMEDIR}/scripts
+UTILITIESDIR = ${SCRIPTSDIR}/utilities
+# TODO: get from variables.sh
+NORESTARTCODES = 100 101
+LIBSYSTEMDIR = /lib/systemd/system
 
 .DEFAULT_GOAL := all
 
 ROOTCHECK=$(shell id -u)
-ifneq ($(ROOTCHECK),0)
-  ifeq ($(PKGBUILD),1)
-    ROOTCHECK=0
-  endif
-endif
-
-ifeq ($(PKGBUILD),)
-  PKGBUILD=0
-endif
-
 
 ENVFILE := env.json
-UNINSTALLFILES := $(DESTDIR)$(sysconfdir)/logrotate.d/allsky $(DESTDIR)$(sysconfdir)/rsyslog.d/allsky.conf $(DESTDIR)$(sysconfdir)/systemd/system/allsky.service $(DESTDIR)$(sysconfdir)/systemd/system/allskyperiodic.service
+UNINSTALLFILES := /etc/logrotate.d/allsky /etc/rsyslog.d/allsky.conf /etc/systemd/system/allsky.service /etc/systemd/system/allskyperiodic.service
 
 %:
-	@echo `date +%F\ %R:%S` nothing to do for $@
+	@echo "`date +%F\ %R:%S` nothing to do for $@"
 
 ifneq ($(ROOTCHECK), 0)
 install uninstall:
-	@echo This must be run with root permissions.
-	@echo Please run \'sudo make $@\'
+	@echo "This must be run with root permissions."
+	@echo "Please run 'sudo make $@'."
 else # Root check passed
 
 uninstall:
-	@echo `date +%F\ %R:%S` Removing installed files: $(UNINSTALLFILES)
+	@echo "`date +%F\ %R:%S` Removing installed files: $(UNINSTALLFILES)"
 	@rm -f $(UNINSTALLFILES)
-	@echo `date +%F\ %R:%S` Complete.
-	@echo `date +%F\ %R:%S` NOTE: Config files were \-NOT\- removed.
-	@echo `date +%F\ %R:%S` To remove config files, please run \'sudo make remove_configs\'
+	@echo "`date +%F\ %R:%S` Complete."
+	@echo "`date +%F\ %R:%S` NOTE: Config files were -NOT- removed."
+	@echo "`date +%F\ %R:%S` To remove config files, please run 'sudo make remove_configs'."
 .PHONY : uninstall
 
-ifeq ($(PKGBUILD),1)
-
-remove_configs:
-	@echo `date +%F\ %R:%S` Removing config path and files $(DESTDIR)$(sysconfigdir)/allsky
-	@rm -rf $(DESTDIR)$(sysconfigdir)/allsky
-
-createDirs:
-	@echo `date +%F\ %R:%S` Creating directory structures...
-	@if [ ! -e $(DESTDIR)$(sysconfdir)/allsky ]; then mkdir -p $(DESTDIR)$(sysconfdir)/allsky; fi
-	@if [ ! -e $(DESTDIR)$(sysconfdir)/profile.d ]; then mkdir -p $(DESTDIR)$(sysconfdir)/profile.d; fi
-	@if [ ! -e $(DESTDIR)$(sysconfdir)/systemd/system ]; then mkdir -p $(DESTDIR)$(sysconfdir)/systemd/system; fi
-	@if [ ! -e $(DESTDIR)$(sysconfdir)/udev/rules.d ]; then mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d; fi
-.PHONY : createDirs
-
-$(ENVFILE):
-	@if [ ! -e $(DESTDIR)$(sysconfdir)/allsky/$@ ]; then \
-	  echo `date +%F\ %R:%S` Copying default $@; \
-	  cp $@.repo > env; \
-	  install -m 0664 env $(HOMEDIR)/$@; \
-	  rm -f env; \
-	fi
-# TODO: In PKGBUILD mode, where is the "allsky" directory?  $(ENVFILE) needs to go in it.
-# Is $(HOMEDIR) the correct location, or should it be $(DESTDIR)$(sysconfdir)/allsky  ?
-.PHONY : $(ENVFILE)
-
-install: createDirs $(ENVFILE)
-	@echo `date +%F\ %R:%S` Setting up udev rules...
-	@install -D -m 0644 asi.rules $(DESTDIR)$(sysconfdir)/udev/rules.d/
-	@echo `date +%F\ %R:%S` Setting up logging...
-	@install -D -m 0644 allsky.logrotate.repo $(DESTDIR)$(sysconfdir)/logrotate.d/allsky
-	@install -D -m 0644 allsky.rsyslog.repo $(DESTDIR)$(sysconfdir)/rsyslog.d/allsky.conf
-	@echo `date +%F\ %R:%S` Setting allsky to auto start...
-	@sed -e "s|XX_ALLSKY_OWNER_XX|allsky|" -e "s|XX_ALLSKY_HOME_XX|$(bindir)|" allsky.service.repo > allsky.service
-	@install -m 0644 allsky.service $(DESTDIR)$(sysconfdir)/systemd/system/
-	@rm -f allsky.service
-	@echo `date +%F\ %R:%S` Setting up home environment variable...
-	@echo "export ALLSKY_TMP=/tmp\nexport ALLSKY_CONFIG=$(DESTDIR)$(sysconfdir)/allsky\nexport ALLSKY_SCRIPTS=$(DESTDIR)$(libexecdir)\nexport ALLSKY_NOTIFICATION_IMAGES=$(DESTDIR)$(sharedir)\nexport ALLSKY_IMAGES=/home/allsky/images/\nPATH=${PATH}:${DESTDIR}$(libexedir)" > $(DESTDIR)$(sysconfdir)/profile.d/allsy.sh
-
-
-else # Not in package build mode ######################################
-
 remove_configs:
-	@echo `date +%F\ %R:%S` Removing config path and files ../config
-	@rm -rf ../config
+	@echo "`date +%F\ %R:%S` Removing config path and files $(CONFIGDIR)"
+	@rm -rf $(CONFIGDIR)
 .PHONY : remove_configs
 
 createDirs:
-	@echo `date +%F\ %R:%S` Creating directory structures...
-	@if [ ! -e ../config ]; then mkdir -p ../config; chown $(SUDO_USER):$(SUDO_USER) ../config; fi
+	@echo "`date +%F\ %R:%S` Creating directory structures..."
+	@if [ ! -e $(CONFIGDIR) ]; then \
+		mkdir -p $(CONFIGDIR); \
+		chown $(SUDO_USER):$(SUDO_USER) $(CONFIGDIR); \
+	fi
 .PHONY : createDirs
 
 install: createDirs
-	@echo `date +%F\ %R:%S` Setting up udev rules...
-	@install -D -m 0644 asi.rules $(DESTDIR)$(sysconfdir)/udev/rules.d/
-	@echo `date +%F\ %R:%S` Setting up logging...
-	@install -D -m 0644 allsky.logrotate.repo $(DESTDIR)$(sysconfdir)/logrotate.d/allsky
-	@install -D -m 0644 allsky.rsyslog.repo $(DESTDIR)$(sysconfdir)/rsyslog.d/allsky.conf
+	@echo "`date +%F\ %R:%S` Setting up udev rules..."
+	@install -D -m 0644 asi.rules /etc/udev/rules.d/
+	@echo "`date +%F\ %R:%S` Setting up logging..."
+	@install -D -m 0644 allsky.logrotate.repo /etc/logrotate.d/allsky
+	@install -D -m 0644 allsky.rsyslog.repo /etc/rsyslog.d/allsky.conf
 	@udevadm control -R
 	@udevadm trigger
-	@echo `date +%F\ %R:%S` Setting allsky to auto start...
+	@echo "`date +%F\ %R:%S` Setting allsky to auto start..."
 	@if [ -e /etc/xdg/lxsession/LXDE-pi/autostart ]; then \
 	  sed -i '/allsky.sh/d' /etc/xdg/lxsession/LXDE-pi/autostart; fi
-	@# Don't use the /lib/systemd/system directory
-	@sed -e "s|XX_ALLSKY_OWNER_XX|$(SUDO_USER)|" -e "s|XX_ALLSKY_HOME_XX|$(HOMEDIR)|" -e "s|XX_ALLSKY_SCRIPTS_XX|$(SCRIPTSDIR)|" allsky.service.repo > allsky.service
-	@install -m 0644 allsky.service $(DESTDIR)$(sysconfdir)/systemd/system/
+	@# Don't use the $(LIBSYSTEMDIR) directory
+	@sed -e "s|XX_ALLSKY_OWNER_XX|$(SUDO_USER)|" \
+	     -e "s|XX_ALLSKY_HOME_XX|$(HOMEDIR)|" \
+	     -e "s|XX_NO_RESTART_CODES_XX|$(NORESTARTCODES)|" \
+	     -e "s|XX_ALLSKY_UTILITIES_XX|$(UTILITIESDIR)|" \
+	  allsky.service.repo > allsky.service
+	@install -m 0644 allsky.service /etc/systemd/system/
 	@rm -f allsky.service
-	@if [ -e /lib/systemd/system/allsky.service ]; then rm -f /lib/systemd/system/allsky.service; fi
-	@sed -e "s|XX_ALLSKY_OWNER_XX|$(SUDO_USER)|" -e "s|XX_ALLSKY_SCRIPTS_XX|$(SCRIPTSDIR)|" allskyperiodic.service.repo > allskyperiodic.service
-	@install -m 0644 allskyperiodic.service $(DESTDIR)$(sysconfdir)/systemd/system/
+	@if [ -e $(LIBSYSTEMDIR)/allsky.service ]; then rm -f $(LIBSYSTEMDIR)/allsky.service; fi
+	@sed -e "s|XX_ALLSKY_OWNER_XX|$(SUDO_USER)|" \
+	     -e "s|XX_NO_RESTART_CODES_XX|$(NORESTARTCODES)|" \
+	     -e "s|XX_ALLSKY_SCRIPTS_XX|$(SCRIPTSDIR)|" \
+	  allskyperiodic.service.repo > allskyperiodic.service
+	@install -m 0644 allskyperiodic.service /etc/systemd/system/
 	@rm -f allskyperiodic.service
-	@if [ -e /lib/systemd/system/allskyperiodic.service ]; then rm -f /lib/systemd/system/allskyperiodic.service; fi
+	@if [ -e $(LIBSYSTEMDIR)/allskyperiodic.service ]; then rm -f $(LIBSYSTEMDIR)/allskyperiodic.service; fi
 	@systemctl daemon-reload
 	@systemctl enable allsky
 	@systemctl enable allskyperiodic
-	@echo `date +%F\ %R:%S` Setting up ALLSKY_HOME environment variable...
-	@echo "export ALLSKY_HOME=$(HOMEDIR)\nPATH=${PATH}:$(SCRIPTSDIR)" > $(DESTDIR)$(sysconfdir)/profile.d/allsky.sh
+	@echo "`date +%F\ %R:%S` Setting up ALLSKY_HOME environment variable..."
+	@echo "export ALLSKY_HOME=$(HOMEDIR)\nPATH=${PATH}:$(SCRIPTSDIR)" > /etc/profile.d/allsky.sh
+
 .PHONY : install
-endif # Package build check
+
 endif # Root check

config_repo/allsky.service.repo

@@ -9,12 +9,13 @@ ExecStart=XX_ALLSKY_HOME_XX/allsky.sh
 SyslogIdentifier=allsky
 Restart=on-success
 RestartSec=2
-; exit status 100 and higher mean a fatal error the user needs to fix, so don't restart
-RestartPreventExitStatus=100 101
+; These exit code are fatal.
+RestartPreventExitStatus=XX_NO_RESTART_CODES_XX
+
 ; XXX RestartKillSignal is not recognized by the systemd that comes with Buster (not sure about Bullseye),
 ; so use ExecReload instead.
 ; RestartKillSignal=SIGUSR1
-ExecReload=XX_ALLSKY_SCRIPTS_XX/reload.sh $MAINPID
+ExecReload=XX_ALLSKY_UTILITIES_XX/reload.sh $MAINPID
 
 [Install]
 WantedBy=multi-user.target

config_repo/allskyperiodic.service.repo

@@ -9,8 +9,8 @@ ExecStart=XX_ALLSKY_SCRIPTS_XX/periodic.sh
 SyslogIdentifier=allskperiodic
 Restart=on-success
 RestartSec=5
-; exit status 100 and higher mean a fatal error the user needs to fix, so don't restart
-RestartPreventExitStatus=100 101
+; These exit code are fatal.
+RestartPreventExitStatus=XX_NO_RESTART_CODES_XX
 
 [Install]
 WantedBy=multi-user.target