fix(script): Fix parameter check error

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

4 files changed, 6 insertions, 11 deletions

diff --git a/docker/dockerbuild.sh b/docker/dockerbuild.sh
index ec933f5..f402d08 100755
--- a/docker/dockerbuild.sh
+++ b/docker/dockerbuild.sh
@@ -15,7 +15,6 @@ if [ $UID -eq 0 ]; then
 
     echo "$TARGET_HOSTS" | base64 -d >> /etc/hosts
 else
-    echo -e "\n[archlinuxcn]\nServer = https://repo.archlinuxcn.org/$$arch\n" | sudo tee -a /etc/pacman.conf
     echo "$TARGET_HOSTS" | base64 -d | sudo tee -a /etc/hosts >/dev/null
 fi
 
@@ -24,13 +23,9 @@ if [ $UID -eq 0 ]; then
 
     su -c "echo $GPG_PRIV_KEY | base64 -d | gpg --import" build
 
-    pushd repo/pod2man
-    su -c 'makepkg -i -s --noconfirm --needed' build
-    popd
-
-    su -c 'BUILD_ONLY="" ./pkgbuild.sh' build
+    su -c './utils/pkgbuild.sh' build
 
-    su -e -c './ci-upload.sh' build
+    su -e -c './utils/ci-upload.sh' build
 
 else
 
@@ -40,9 +35,9 @@ else
     makepkg -i -s --noconfirm --needed
     popd
 
-    BUILD_ONLY='' ./pkgbuild.sh
+    ./utils/pkgbuild.sh
 
-    ./ci-upload.sh
+    ./utils/ci-upload.sh
 
 fi
 
diff --git a/utils/aur/aur-check-update.py b/utils/aur/aur-check-update.py
index 3188aea..bc79cdc 100755
--- a/utils/aur/aur-check-update.py
+++ b/utils/aur/aur-check-update.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (C) 2021 KunoiSayami
+# Copyright (C) 2021 KunoiSayami and contributors
 #
 # This module is part of KunoiSayami/repos and is released under
 # the AGPL v3 License: https://www.gnu.org/licenses/agpl-3.0.txt
diff --git a/utils/aur/check-aur.py b/utils/aur/check-aur-dependencies.py
index 6749f69..6749f69 100755
--- a/utils/aur/check-aur.py
+++ b/utils/aur/check-aur-dependencies.py
diff --git a/utils/pkgbuild.sh b/utils/pkgbuild.sh
index 46d0285..16b13bd 100755
--- a/utils/pkgbuild.sh
+++ b/utils/pkgbuild.sh
@@ -152,7 +152,7 @@ popd
 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
+    if [ -n "$CI_DEFAULT_BRANCH" ] && [ -n "$CI_COMMIT_BRANCH" ] && [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
         touch .fail
     else
         echo -e "\033[0;31mExit due makepkg failed\033[0m"