From ca82bf3024f54f9385c7a4ba7bcea45f962c3a06 Mon Sep 17 00:00:00 2001
From: Maxim Slipenko <maxim@slipenko.com>
Date: Fri, 30 May 2025 19:26:08 +0300
Subject: [PATCH] ci: fix

---
 .gitea/workflows/release.yaml | 24 ++++++++++++++----------
 Makefile                      | 11 +++++++----
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml
index fc7c6b3..9cbe94f 100644
--- a/.gitea/workflows/release.yaml
+++ b/.gitea/workflows/release.yaml
@@ -52,6 +52,8 @@ jobs:
           apt-get update && apt-get install -y libcap2-bin
 
       - name: Build alr
+        env:
+          IGNORE_ROOT_CHECK: 1
         run: |
           make build
 
@@ -84,18 +86,11 @@ jobs:
           sed -i "s/version='[0-9]\+\.[0-9]\+\.[0-9]\+'/version='${{ env.VERSION }}'/g" alr-default/alr-bin/alr.sh
           sed -i "s/release='[0-9]\+'/release='1'/g" alr-default/alr-bin/alr.sh
 
-      - name: Commit changes
-        run: |
-          cd alr-default
-          git config user.name "gitea"
-          git config user.email "admin@plemya-x.ru"
-          git add .
-          git commit -m "Обновление версии до ${{ env.VERSION }}"
-          git push
-
       - name: Install alr
         run: |
           make install
+          # temporary fix
+          groupadd wheel
 
       - name: Build packages
         run: |
@@ -113,4 +108,13 @@ jobs:
             alr-bin+alr-default_${{ env.VERSION }}-1.red80_amd64.deb \
             alr-bin+alr-default-${{ env.VERSION }}-1-x86_64.pkg.tar.zst \
             alr-bin+alr-default-${{ env.VERSION }}-1.red80.x86_64.rpm \
-            alr-bin+alr-default-${{ env.VERSION }}-alt1.x86_64.rpm 
+            alr-bin+alr-default-${{ env.VERSION }}-alt1.x86_64.rpm
+
+      - name: Commit changes
+        run: |
+          cd alr-default
+          git config user.name "gitea"
+          git config user.email "admin@plemya-x.ru"
+          git add .
+          git commit -m "Обновление версии до ${{ env.VERSION }}"
+          git push
diff --git a/Makefile b/Makefile
index e0dcf84..8b1d5aa 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ $(BIN):
 	go build -ldflags="-X 'gitea.plemya-x.ru/Plemya-x/ALR/internal/config.Version=$(GIT_VERSION)'" -o $@
 
 check-no-root:
-	@if [[ "$(IGNORE_ROOT_CHECK)" != "1" ]] && [[ "$$(whoami)" == 'root' ]]; then \
+	@if [ "$$IGNORE_ROOT_CHECK" != "1" ] && [ "`whoami`" = "root" ]; then \
 		echo "This target shouldn't run as root" 1>&2; \
 		echo "Set IGNORE_ROOT_CHECK=1 to override" 1>&2; \
 		exit 1; \
@@ -39,9 +39,12 @@ install: \
 $(INSTALED_BIN): $(BIN)
 	install -Dm755 $< $@
 	setcap cap_setuid,cap_setgid+ep $(INSTALED_BIN)
-	id -u alr &>/dev/null || useradd -r -s /usr/sbin/nologin alr
-	mkdir -p /var/cache/alr /etc/alr
-	chown alr:alr /var/cache/alr /etc/alr
+	@if id alr >/dev/null 2>&1; then \
+		echo "User 'alr' already exists. Skipping."; \
+	else \
+		useradd -r -s /usr/sbin/nologin alr; \
+	fi
+	install -d -o alr -g alr -m 755 /var/cache/alr /etc/alr
 
 $(INSTALLED_BASH_COMPLETION): $(BASH_COMPLETION)
 	install -Dm755 $< $@