diff --git a/commit.sh b/commit.sh index 75d074b..6c19013 100755 --- a/commit.sh +++ b/commit.sh @@ -5,7 +5,7 @@ echo "==> Checking for updates..." git clean -fdx if [[ `git status --porcelain` ]]; then echo "==> Update detected" - sed -i -e 's/pkgrel=.*/pkgrel=1/g' ./PKGBUILD + sed -i -e 's|pkgrel=.*|pkgrel=1|g' ./PKGBUILD makepkg --printsrcinfo > .SRCINFO git diff ./PKGBUILD git add PKGBUILD .SRCINFO @@ -13,7 +13,7 @@ if [[ `git status --porcelain` ]]; then pkgver="$(grep -oP '(?<=pkgver = ).*' .SRCINFO)" commit="$pkgname $pkgver-1" echo "==> pushing $commit" - git commit -m "upgpkg: $commit" -m "pushed by aur-updater" + git commit -m "upgpkg: $commit" -m "pushed by aur-deploy" git push origin HEAD else echo "==> No update detected" diff --git a/startup.sh b/startup.sh index 8082e6c..e41ad8b 100755 --- a/startup.sh +++ b/startup.sh @@ -4,7 +4,7 @@ mkdir -p /usr/volume/common/ssh && chown user:user /usr/volume/common/ssh && chm touch /usr/volume/common/gitconfig if [ -z "$(ls -A ~/.ssh/)" ]; then echo "==> SSH folder empty. Generating key..." - ssh-keygen -t ed25519 -C "aur-updater" -f "/usr/volume/common/ssh/id_ed25519" -N "" + ssh-keygen -t ed25519 -C "aur-deploy" -f "/usr/volume/common/ssh/id_ed25519" -N "" echo "==> Public key:" cat ~/.ssh/id_ed25519.pub fi @@ -21,7 +21,7 @@ else fi rm -f /usr/volume/common/ssh/known_hosts.old echo "==> Ready. Cron job is scheduled." -R=$(echo "$CRON" | sed "s/\\//\\\\\\//g") -sed "s/%CRON%/$R/" /usr/files/cron > /usr/files/.cron +R=$(echo "$CRON") +sed "s|%CRON%|$R|" /usr/files/cron > /usr/files/.cron crontab /etc/cron.d/.cron doas `which crond` -n