feat(script): Improve error process

Signed-off-by: KunoiSayami <[email protected]>

4 files changed, 123 insertions, 12 deletions

diff --git a/.gitignore b/.gitignore
index 11c836b..376ebc6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,96 @@
 build/
 *.pkg*
+
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# IPython Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# dotenv
+.env
+
+# virtualenv
+venv/
+ENV/
+
+# Spyder project settings
+.spyderproject
+
+# Rope project settings
+.ropeproject
+
+.vscode/
+.idea/
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c409726..720ccd8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,6 +25,7 @@ build:
 
   script:
     - echo -e '\n[archlinuxcn]\nServer = https://repo.archlinuxcn.org/$arch\n' >> /etc/pacman.conf
+    - echo -e '\n[kunoisayami]\nServer = https://$REPO_REMOTE/$arch\n' >> /etc/pacman.conf
     - pacman-key --init
     # import myself key first
     - curl -fL https://keys.openpgp.org/vks/v1/by-fingerprint/4A0F0C8BC709ACA4341767FB243975C8DB9656B9 | pacman-key --add -
diff --git a/ci-upload.sh b/ci-upload.sh
index 9af18d4..307912e 100755
--- a/ci-upload.sh
+++ b/ci-upload.sh
@@ -28,3 +28,6 @@ popd
 
 curl -d "token=$UPLOAD_TOKEN&action=UPLOADED&arch=$ARCH" -fsSL "$REMOTE_PATH"
 
+if [ -r .fail ]; then
+	exit 2;
+fi
diff --git a/pkgbuild.sh b/pkgbuild.sh
index 9e1e3ae..bda2b16 100755
--- a/pkgbuild.sh
+++ b/pkgbuild.sh
@@ -7,6 +7,7 @@ set -Eeuo pipefail
 trap cleanup SIGINT SIGTERM ERR EXIT
 cleanup() {
 	trap - SIGINT SIGTERM ERR EXIT
+    unset UNSUCCESSFUL
     unset SKIP_VERIFIED
 	unset FOLDER_NAME
 	unset PKGDEST
@@ -38,6 +39,7 @@ SRCDEST="${PWD}/build"
 CONFDEST="${PWD}/makepkg.d/makepkg.$ARCH.conf"
 REPO_DIFF="${PWD}/packages/$ARCH/DIFF"
 SKIP_VERIFIED=1
+UNSUCCESSFUL=0
 
 TMPCONF=$(mktemp -t makepkg.$ARCH.conf.XXXXXXXXXX) || exit 1
 cat "${PWD}/makepkg.d/makepkg.base.conf" > "$TMPCONF"
@@ -54,8 +56,8 @@ function get_diff_list {
         fi
     done
     cp "$REPO_DIFF"  "${REPO_DIFF}_tmp"
-    sort "${REPO_DIFF}_tmp" | uniq -u > "$REPO_DIFF"
-    rm -rf "${REPO_DIFF}_tmp"
+    sort -u "${REPO_DIFF}_tmp" > "$REPO_DIFF"
+    rm -f "${REPO_DIFF}_tmp"
 }
 
 if [ $# -gt 0 ] && [ "$1" = "--diff" ]; then
@@ -75,30 +77,38 @@ if [ $# -gt 0 ] && [ "$1" = "--all" ] || [ -n "$CI_COMMIT_TITLE" ] && [[ $CI_COM
     ls $PKGBUILD_DIRECTORY_BASE > "$REPO_DIFF"
 else
     get_diff_list
+    echo "Next"
 fi
 
-pushd $PKGBUILD_DIRECTORY_BASE || ( echo -e "\033[1;33mError, can't switch to pkgbuild directory\033[0m" && exit 1 )
+pushd $PKGBUILD_DIRECTORY_BASE || ( echo -e "\033[0;31mError, can't switch to pkgbuild directory\033[0m" && exit 1 )
 
-while read FOLDER_NAME ; do
+while read -r FOLDER_NAME ; do
     if [ ! -d "$FOLDER_NAME" ]; then
         echo -e "\033[0;32mSkip folder $FOLDER_NAME\033[0m"
         continue
     fi
-    pushd "$FOLDER_NAME" || continue
+    echo -e "\033[0;32mProcessing $FOLDER_NAME\033[0m"
+    pushd "$FOLDER_NAME" || { echo -e "\033[1;33mWarning, can't chdir to $FOLDER_NAME, skipped\033[0m"; continue; }
+
+    # hook must run before other checker
+    hook "$FOLDER_NAME"
+
     # Check PKGBUILD architecture
     if ! ( pcregrep -M 'arch=\([^\)]*\)' PKGBUILD | grep -E "$ARCH|any" >/dev/null ); then
+        echo -e "\033[0;32mSkip folder $FOLDER_NAME (Architecture not match)\033[0m"
         popd
         continue
     fi
 
     if [ -n "$CI_COMMIT_TITLE" ] && [[ $CI_COMMIT_TITLE =~ fix\(repo\)|REBUILD ]] && \
         [ $SKIP_VERIFIED -eq 1 ] && grep -Fxq "$FOLDER_NAME" "../.verified_repos"; then
+        echo -e "\033[0;32mSkip folder $FOLDER_NAME (verified repository)\033[0m"
         popd
         continue
     fi
 
     if [ -r ../.yaydeps/"$FOLDER_NAME" ]; then
-        while read YAYDEP ; do
+        while read -r YAYDEP ; do
             if [ -d "../$YAYDEP" ]; then
                 pushd "../$YAYDEP"
                 hook "$YAYDEP"
@@ -116,16 +126,19 @@ while read FOLDER_NAME ; do
         | awk 'BEGIN { FS = "\n" } ; { print $1":6:" } ' | gpg --import-ownertrust
     fi
 
-    hook "$FOLDER_NAME"
-    SRCPKGDEST=$SRCDEST SRCDEST=$SRCDEST PKGDEST=$PKGDEST MAKEPKG_CONF="$TMPCONF" makepkg --clean -s --asdeps --noconfirm --needed --noprogressbar || echo -e "\033[0;31mSkip folder $FOLDER_NAME\033[0m"
+    SRCPKGDEST=$SRCDEST SRCDEST=$SRCDEST PKGDEST=$PKGDEST MAKEPKG_CONF="$TMPCONF" makepkg --clean -s --asdeps --noconfirm --needed --noprogressbar || { echo -e "\033[0;31mSkip folder $FOLDER_NAME\033[0m"; UNSUCCESSFUL=1; }
     popd
 done < "$REPO_DIFF"
 
 popd
 
-if [ -z "${BUILD_ONLY+x}" ]; then
-    echo -e "\033[1;33mThis option is depreacted, this script isn't process repository database now\033[0m"
-fi
-
 date +%s > "$PKGDEST/LASTBUILD"
 
+if [ $UNSUCCESSFUL -eq 1 ]; then
+    if [ -n "$CI_DEFAULT_BRANCH" ] && [ -n "$CI_DEFAULT_BRANCH" ] && [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
+        touch .fail
+    else
+        echo -e "\033[0;31mExit due makepkg failed\033[0m"
+        exit 2
+    fi
+fi