From 7833bbf7de0958551831b584464f67e4af3f6a1b Mon Sep 17 00:00:00 2001
From: KunoiSayami <i@leanhe.dev>
Date: Wed, 3 Nov 2021 19:48:05 +0800
Subject: feat(script): Optimize GPG key import

Signed-off-by: KunoiSayami <i@leanhe.dev>
---
 pkgbuild.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'pkgbuild.sh')

diff --git a/pkgbuild.sh b/pkgbuild.sh
index 39718bb..9e1e3ae 100755
--- a/pkgbuild.sh
+++ b/pkgbuild.sh
@@ -63,6 +63,11 @@ if [ $# -gt 0 ] && [ "$1" = "--diff" ]; then
     exit 0
 fi
 
+if [ "$EUID" -eq 0 ] ; then
+    echo "\033[0;32mPlease run this script as non-root\033[0m"
+    exit 3
+fi
+
 if [ $# -gt 0 ] && [ "$1" = "--all" ] || [ -n "$CI_COMMIT_TITLE" ] && [[ $CI_COMMIT_TITLE =~ fix\(repo\)|REBUILD ]]; then
     if [ -z "${FORCE_ALL+x}" ] || [ -n "$CI_COMMIT_TITLE" ] && [[ $CI_COMMIT_TITLE =~ REBUILD(\ |_)ALL ]]; then
         SKIP_VERIFIED=0
@@ -86,7 +91,8 @@ while read FOLDER_NAME ; do
         continue
     fi
 
-    if [ $SKIP_VERIFIED -eq 1 ] && grep -Fxq "$FOLDER_NAME" "../.verified_repos"; then
+    if [ -n "$CI_COMMIT_TITLE" ] && [[ $CI_COMMIT_TITLE =~ fix\(repo\)|REBUILD ]] && \
+        [ $SKIP_VERIFIED -eq 1 ] && grep -Fxq "$FOLDER_NAME" "../.verified_repos"; then
         popd
         continue
     fi
@@ -106,6 +112,8 @@ while read FOLDER_NAME ; do
 
     if [ -r ../.gpg_keys/"$FOLDER_NAME" ]; then
         . ../.gpg_keys/"$FOLDER_NAME"
+        gpg --list-keys --fingerprint |grep pub -A 1|grep -Ev "pub|--"|tr -d ' ' \
+        | awk 'BEGIN { FS = "\n" } ; { print $1":6:" } ' | gpg --import-ownertrust
     fi
 
     hook "$FOLDER_NAME"
-- 
cgit v1.3.1