diff options
Diffstat (limited to 'utils')
| -rwxr-xr-x | utils/pkgbuild.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/utils/pkgbuild.sh b/utils/pkgbuild.sh index 1baa51f..46d0285 100755 --- a/utils/pkgbuild.sh +++ b/utils/pkgbuild.sh @@ -1,7 +1,7 @@ #!/bin/bash # end up when failed -set -Eeuo pipefail +set -Eeo pipefail # clean up when exit trap cleanup SIGINT SIGTERM ERR EXIT @@ -41,7 +41,7 @@ CONFDEST="${PWD}/makepkg.d/makepkg.$ARCH.conf" REPO_DIFF="${PWD}/packages/$ARCH/DIFF" SKIP_VERIFIED=1 UNSUCCESSFUL=0 -SIGNING_ARG="" +SIGNING_ARG="--nosign" TMPCONF=$(mktemp -t makepkg.$ARCH.conf.XXXXXXXXXX) || exit 1 cat "${PWD}/makepkg.d/makepkg.base.conf" > "$TMPCONF" @@ -67,7 +67,7 @@ if [ $# -gt 0 ];then get_diff_list exit 0 elif [ "$1" = "--import-gpg" ]; then - if [ -n "$CI_DEFAULT_BRANCH" ] && [ -n "$CI_DEFAULT_BRANCH" ] && [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then + if [ -n "$CI_COMMIT_BRANCH" ] && [ -n "$CI_DEFAULT_BRANCH" ] && [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then echo $GPG_PRIV_KEY | base64 -d | gpg --import else echo -e "\033[0;32mSkip import gpg key\033[0m" @@ -90,8 +90,8 @@ else get_diff_list fi -if [ -n "$CI_DEFAULT_BRANCH" ] && [ -n "$CI_DEFAULT_BRANCH" ] && [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then - SIGNING_ARG="-s" +if [ -n "$CI_COMMIT_BRANCH" ] && [ -n "$CI_DEFAULT_BRANCH" ] && [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then + SIGNING_ARG="--sign" else echo -e "\033[0;32mSkip signing package\033[0m" fi @@ -128,7 +128,7 @@ while read -r FOLDER_NAME ; do if [ -d "../$YAYDEP" ]; then pushd "../$YAYDEP" hook "$YAYDEP" - SRCPKGDEST=$SRCDEST SRCDEST=$SRCDEST PKGDEST=$PKGDEST MAKEPKG_CONF="$TMPCONF" makepkg --clean -i $SIGNING_ARG --asdeps --noconfirm --needed --noprogressbar + SRCPKGDEST=$SRCDEST SRCDEST=$SRCDEST PKGDEST=$PKGDEST MAKEPKG_CONF="$TMPCONF" makepkg --clean -s -i $SIGNING_ARG --asdeps --noconfirm --needed --noprogressbar popd else yay -S --noconfirm --needed --asdeps "$YAYDEP" @@ -143,7 +143,7 @@ while read -r FOLDER_NAME ; do | awk 'BEGIN { FS = "\n" } ; { print $1":6:" } ' | gpg --import-ownertrust fi - SRCPKGDEST=$SRCDEST SRCDEST=$SRCDEST PKGDEST=$PKGDEST MAKEPKG_CONF="$TMPCONF" makepkg --clean $SIGNING_ARG --asdeps --noconfirm --needed --noprogressbar || { echo -e "\033[0;31mSkip folder $FOLDER_NAME\033[0m"; UNSUCCESSFUL=1; } + SRCPKGDEST=$SRCDEST SRCDEST=$SRCDEST PKGDEST=$PKGDEST MAKEPKG_CONF="$TMPCONF" makepkg -s --clean $SIGNING_ARG --asdeps --noconfirm --needed --noprogressbar || { echo -e "\033[0;31mSkip folder $FOLDER_NAME\033[0m"; UNSUCCESSFUL=1; } popd done < "$REPO_DIFF" |