Merge pull request #69 from NeroReflex/bugfixes

Bug fixes and verious improments

Author: NeroReflex

.github/workflows/tests.yaml

@@ -28,6 +28,9 @@ jobs:
       run: |
         cd test
         ./run.sh
+    - name: Test Tracker file permissions
+      run: |
+        docker run --name test_tracker -u root --rm --entrypoint=/workdir/test/test-permissions.sh -v $(pwd):/workdir -v /dev:/dev --privileged archlinux:latest
     - name: Test Deployment creation & installation
       run: |
         docker run --name test_deploy -u root --rm --entrypoint=/workdir/test/test-deploy.sh -v $(pwd):/workdir -v /dev:/dev --privileged archlinux:latest

Makefile

@@ -3,7 +3,9 @@ ifeq ($(PREFIX),)
     PREFIX := /
 endif
 
-VERSION := $(shell git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
+ifeq ($(VERSION),)
+	VERSION := $(shell git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
+endif
 
 .PHONY: install
 
@@ -17,8 +19,6 @@ install:
 	install -m 755 "__frzr-unlock" "${PREFIX}/usr/bin"
 	install -m 755 "frzr-bootloader" "${PREFIX}/usr/bin"
 	install -m 755 "__frzr-bootloader" "${PREFIX}/usr/bin"
-	install -m 755 "frzr-kernel" "${PREFIX}/usr/bin"
-	install -m 755 "__frzr-kernel" "${PREFIX}/usr/bin"
 	install -m 755 "frzr-version" "${PREFIX}/usr/bin"
 	install -m 755 "__frzr-version" "${PREFIX}/usr/bin"
 	install -m 755 "frzr-bootstrap" "${PREFIX}/usr/bin"

__frzr

@@ -46,11 +46,28 @@ EOF
 trap frzr_status SIGINT SIGTERM ERR
 
 write_tracker_file() {
-	local running_user=$(whoami)
+	local grps=$(groups)
+
+	if [ ! -d "${TRACKER_FILE_DIR}" ]; then
+		if echo "$grps" | grep -Fq "frzr"; then
+			sg frzr -c "mkdir $TRACKER_FILE_DIR"
+		else
+			mkdir "${TRACKER_FILE_DIR}"
+			chmod g+w "${TRACKER_FILE_DIR}"
+			chown :frzr "${TRACKER_FILE_DIR}"
+		fi
+	fi
+
 	if [ ! -f "${TRACKER_FILE_PATH}" ]; then
-		touch "${TRACKER_FILE_PATH}"
-		chown $UID:379 "${TRACKER_FILE_PATH}"
-		chmod g+w "${TRACKER_FILE_PATH}"
+		if echo "$grps" | grep -Fq "frzr"; then
+			rm -f "${TRACKER_FILE_PATH}"
+			sg frzr -c "touch ${TRACKER_FILE_PATH}"
+		else
+			sudo rm -rf "${TRACKER_FILE_PATH}" 
+			sudo touch "${TRACKER_FILE_PATH}"
+			sudo chown :frzr "${TRACKER_FILE_PATH}"
+			sudo chmod g+w "${TRACKER_FILE_PATH}"
+		fi
 	fi
 
 	frzr_status > "${TRACKER_FILE_PATH}"

__frzr-envars

@@ -28,6 +28,10 @@ if [ -z "$EFI_MOUNT_PATH" ]; then
 	EFI_MOUNT_PATH="${MOUNT_PATH}/efi" # EFI mount path
 fi
 
+if [ -z "$SHOW_UI" ]; then
+	SHOW_UI="0"
+fi
+
 if [ -z "$FRZR_INSTALLER" ]; then
 	FRZR_INSTALLER="0"
 fi
@@ -47,7 +51,7 @@ ACTUAL_CHECKSUM=""   # Actual checksum of the file downloaded
 STATE=""
 
 # Tracker file directory
-TRACKER_FILE_DIR="/tmp"
+TRACKER_FILE_DIR="/tmp/frzr"
 TRACKER_FILE_PATH="${TRACKER_FILE_DIR}/frzr.tracker"
 
 # Signals