From 1c08a452a12bb014b5c974b4ee2644859a0aa30a Mon Sep 17 00:00:00 2001
From: itmodulo <itmodulo@disroot.org>
Date: Thu, 22 Feb 2024 21:11:22 +0100
Subject: [PATCH] roll back and change default shell to bash

---
 .gitea/workflows/release_arm64v8.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitea/workflows/release_arm64v8.yml b/.gitea/workflows/release_arm64v8.yml
index 1b29d14..fa9cdfe 100644
--- a/.gitea/workflows/release_arm64v8.yml
+++ b/.gitea/workflows/release_arm64v8.yml
@@ -14,7 +14,7 @@ jobs:
         run: apk -U upgrade
       - name: Install needed tools
         shell: sh
-        run: apk add bash git wget curl nodejs sshfs alpine-sdk abuild sudo pup
+        run: apk add bash git wget curl nodejs sshfs alpine-sdk abuild sudo pup shadow  
       - name: Checkout
         uses: actions/checkout@v3
       - name: Set up environment and users
@@ -29,6 +29,7 @@ jobs:
             chmod 440 /etc/sudoers
             mkdir -p /var/cache/distfiles
             chmod a+w /var/cache/distfiles
+            chsh -s /bin/bash
             su - runner -c 'mkdir ~/.abuild'
             echo "setup done"
       - name: Set up keys
@@ -40,17 +41,16 @@ jobs:
             cp -r srcpkgs /home/runner/ && chown -R runner:runner /home/runner/srcpkgs
       - name: Determine packages to build
         run: |
-            su - runner -c "pwd; ls -lah --color"
-            su - runner -c "curl --silent https://static.itmodulo.eu/dl/repo/alpine/latest-stable/main/aarch64/ | pup 'a text{}' | grep \.apk  > /home/runner/repo.txt"
-            su - runner -c "touch /home/runner/local.txt"
-            su - runner -c 'for i in /home/runner/srcpkgs/*; do printf "%s-%s-r%s.apk\n" "$(echo $i | cut -d '/' -f 5)" "echo $(cat $i/APKBUILD | grep pkgver | grep -v '\$' | cut -d '=' -f 2 )" "echo $(cat $i/APKBUILD | grep pkgrel | grep -v '\$' | cut -d '=' -f 2 )" >>  /home/runner/local.txt; done'
-            su - runner -c 'echo "LOCAL:"; cat /home/runner/local.txt'
-            su - runner -c "grep -Fvxf /home/runner/repo.txt /home/runner/local.txt > /home/runner/missing.txt"
-            su - runner -c 'echo "MISSING:"; cat /home/runner/missing.txt'
-            su - runner -c "sed -i -E 's/-[0-9a-z.]+-r[0-9]+\.apk//g' /home/runner/missing.txt"
-            su - runner -c "for i in $(cat /home/runner/missing.txt); do sed -i -E 's/'"${i}"-[0-9a-z.]+-r[0-9]+\.apk'//g' /home/runner/repo.txt; done"
-            su - runner -c 'echo "REPO:"; cat /home/runner/repo.txt'            
-            su - runner -c 'echo "WILL BUILD:"; cat /home/runner/missing.txt'
+            su - runner -c "curl --silent https://static.itmodulo.eu/dl/repo/alpine/latest-stable/main/aarch64/ | pup 'a text{}' | grep \.apk  > ~/repo.txt"
+            su - runner -c "touch ~/local.txt"
+            su - runner -c 'cd ~/srcpkgs; for i in ./* ; do printf "%s-%s-r%s.apk\n" "$(echo $i | cut -d '/' -f 2)" "$(cat $i/APKBUILD | grep pkgver | grep -v '\$' | cut -d '=' -f 2 )" "$(cat $i/APKBUILD | grep pkgrel | grep -v '\$' | cut -d '=' -f 2 )" >> ~/local.txt; done'
+            su - runner -c 'echo "LOCAL:"; cat ~/local.txt'
+            su - runner -c "grep -Fvxf ~/repo.txt ~/local.txt > ~/missing.txt"
+            su - runner -c 'echo "MISSING:"; cat ~/missing.txt'
+            su - runner -c "sed -i -E 's/-[0-9a-z.]+-r[0-9]+\.apk//g' missing.txt"
+            su - runner -c "for i in $(cat missing.txt); do sed -i -E 's/'"${i}"-[0-9a-z.]+-r[0-9]+\.apk'//g' ~/repo.txt; done;"
+            su - runner -c 'echo "REPO:"; cat ~/repo.txt'            
+            su - runner -c 'echo "WILL BUILD:"; cat ~/missing.txt'
 
       - name: Compile missing in sequence
         run: |