From 9deca764a03da3fcef86b21e1a38929b5ea4ab5a Mon Sep 17 00:00:00 2001 From: itmodulo Date: Thu, 22 Feb 2024 21:32:34 +0100 Subject: [PATCH] Fixing inner commands --- .gitea/workflows/release_arm64v8.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/release_arm64v8.yml b/.gitea/workflows/release_arm64v8.yml index 61d2d4a..662cfef 100644 --- a/.gitea/workflows/release_arm64v8.yml +++ b/.gitea/workflows/release_arm64v8.yml @@ -42,14 +42,15 @@ jobs: - name: Determine packages to build run: | su - runner -c "echo ~" + su - runner -c 'echo ~' 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 echo $i; 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 'cd ~/srcpkgs; for i in ./* ; 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 "for i in $(cat /home/runner/missing.txt); do sed -i -E 's/'"${i}"-[0-9a-z.]+-r[0-9]+\.apk'//g' ~/repo.txt; done;" su - runner -c 'echo "MISSING:"; cat ~/missing.txt' su - runner -c 'echo "REPO:"; cat ~/repo.txt' su - runner -c 'echo "WILL BUILD:"; cat ~/missing.txt' @@ -66,7 +67,7 @@ jobs: su - runner -c 'sshfs -p "${{ secrets.LOGIN_PORT }}" -o StrictHostKeyChecking=accept-new -o default_permissions,allow_other -o IdentityFile=/home/runner/id_ecdsa "${{ secrets.SERVER_LOGIN_AND_ADDRESS }}":"${{ secrets.SERVER_REPO_PATH }}" /home/runner/hole' su - runner -c 'ls -lah /home/runner/hole/latest-stable/main/aarch64/' su - runner -c 'mkdir toindex && mv ~/packages/srcpkgs/aarch64/*.apk ~/toindex/' - su - runner -c 'for i in $(cat repo.txt); do cp "hole/latest-stable/main/aarch64/$i" ~/toindex/' + su - runner -c 'for i in $(cat repo.txt); do cp "hole/latest-stable/main/aarch64/$i" ~/toindex/; done' su - runner -c 'apk index /home/runner/toindex/APKINDEX.tar.gz /home/runner/toindex/*.apk' su - runner -c 'abuild-sign -k /home/runner/.abuild/${{ secrets.REPO_PRIVKEY_FILENAME }} /home/runner/toindex/APKINDEX.tar.gz' su - runner -c 'rm -rf hole/latest-stable/main/aarch64/*'