From 0653d9803c1fcc8ce5d07f0e878f76c7fff3b5e8 Mon Sep 17 00:00:00 2001
From: MedzikUser <nivua1fn@duck.com>
Date: Sat, 18 Jun 2022 22:35:04 +0200
Subject: [PATCH] update

---
 packages/imgurs/PKGBUILD             | 13 ++++++++--
 packages/imgurs/built.conf           |  2 +-
 packages/revanced-cli/built.conf     |  2 +-
 packages/revanced-patches/built.conf |  2 +-
 scripts/push-aur.sh                  | 38 ++++++++++------------------
 5 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/packages/imgurs/PKGBUILD b/packages/imgurs/PKGBUILD
index afd14487..e5059aa8 100644
--- a/packages/imgurs/PKGBUILD
+++ b/packages/imgurs/PKGBUILD
@@ -20,6 +20,15 @@ build() {
 
 package() {
   cd "${pkgname}-${pkgver}"
-  install -Dm 755 target/release/${pkgname} "${pkgdir}/usr/bin/${pkgname}"
-  install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm 755 target/release/$pkgname "$pkgdir/usr/bin/$pkgname"
+
+  mkdir -p "$pkgdir"/usr/share/{bash-completion/completions,zsh/site-functions,fish/vendor_completions.d}
+  target/release/$pkgname completions bash > "$pkgdir"/usr/share/bash-completion/completions/$pkgname
+  target/release/$pkgname completions zsh > "$pkgdir"/usr/share/zsh/site-functions/_$pkgname
+  target/release/$pkgname completions fish > "$pkgdir"/usr/share/fish/vendor_completions.d/$pkgname.fish
+
+  mkdir -p "$pkgdir/usr/share/man/man1"
+  target/release/$pkgname manpage | gzip > "$pkgdir/usr/share/man/man1/$pkgname.1.gz"
+
+  install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/packages/imgurs/built.conf b/packages/imgurs/built.conf
index 1f0f94e1..b4b3b1ff 100644
--- a/packages/imgurs/built.conf
+++ b/packages/imgurs/built.conf
@@ -1,2 +1,2 @@
 GITHUB_REPO="MedzikUser/imgurs"
-AUR_PUSH="imgurs"
+AUR_PUSH="true"
diff --git a/packages/revanced-cli/built.conf b/packages/revanced-cli/built.conf
index f061225c..54943f90 100644
--- a/packages/revanced-cli/built.conf
+++ b/packages/revanced-cli/built.conf
@@ -1,2 +1,2 @@
 GITHUB_REPO="revanced/revanced-cli"
-AUR_PUSH="revanced-cli"
+AUR_PUSH="true"
diff --git a/packages/revanced-patches/built.conf b/packages/revanced-patches/built.conf
index b1d789f3..1470580a 100644
--- a/packages/revanced-patches/built.conf
+++ b/packages/revanced-patches/built.conf
@@ -1,2 +1,2 @@
 GITHUB_REPO="revanced/revanced-patches"
-AUR_PUSH="revanced-patches"
+AUR_PUSH="true"
diff --git a/scripts/push-aur.sh b/scripts/push-aur.sh
index a958100e..64179fcc 100755
--- a/scripts/push-aur.sh
+++ b/scripts/push-aur.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -o errexit -o pipefail -o nounset
+#set -o errexit -o pipefail
 
 # Commit changes to Git.
 : "${GIT_COMMIT_PACKAGES:=false}"
@@ -34,7 +34,7 @@ git config --global user.name "${COMMIT_USER}"
 git config --global user.email "${COMMIT_EMAIL}"
 echo '::endgroup::'
 
-push() {
+push-aur() {
   local pkgdir="${1}"
   local pkgname="$(basename ${pkgdir})"
 
@@ -56,13 +56,15 @@ push() {
 
     if [ -n "${AUR_PUSH}" ]
     then
+      echo "==> ${pkgname}"
+
       echo '::group::Cloning AUR package into /tmp/local-repo'
-      git clone -v "https://aur.archlinux.org/${pkgname}.git" /tmp/local-repo
+      git clone -v "ssh://aur@aur.archlinux.org/${pkgname}.git" /tmp/local-repo
       echo '::endgroup::'
 
       echo '::group::Copying files into /tmp/local-repo'
       cp -r "${pkgdir}"/* /tmp/local-repo/
-      rm -rf /tmp/local-repo//build.yml
+      rm -rf /tmp/local-repo/build.conf
       echo '::endgroup::'
 
       echo '::group::Generating .SRCINFO'
@@ -78,32 +80,18 @@ push() {
       echo '::group::Push package to AUR'
       git push -v origin master
       echo '::endgroup::'
+
+      echo '::group::Cleanup'
+      rm -rf /tmp/local-repo/
+      echo '::endgroup::'
       return 0
     fi
   fi
 }
 
-if [ -n "${1}" ]
-then
-  update-package "./packages/${1}"
-  update-package "./long-built/${1}"
-  exit 0
-fi
-
 for pkgdir in ./packages/* ./long-built/*
 do
-  push "${pkgdir}"
-
-  EXIT_CODE="${?}"
-
-  if ! (( ${EXIT_CODE} ))
-  then
-    if [ "${GIT_PUSH_PACKAGES}" = "true" ]
-    then
-      git pull --rebase &> /dev/null
-      git push &> /dev/null
-    fi
-  else
-    echo "[!] Failed to update package '$(basename ${pkgdir})'"
-  fi
+  echo "==> Running: $(basename ${pkgdir})"
+  push-aur "${pkgdir}" &
+  wait
 done