From ddaf62f28c6210c7c756a723286b936751b499af Mon Sep 17 00:00:00 2001 From: Kunoi Sayami Date: Tue, 2 Nov 2021 12:56:27 +0800 Subject: fix(dep): [REBUILD] Fix glib2-static missing dependencies (#14) fix(script): Fix detect function not working properly Signed-off-by: KunoiSayami --- pkgbuild.sh | 6 ++++-- repo/.yaydeps/glib2-static | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 repo/.yaydeps/glib2-static diff --git a/pkgbuild.sh b/pkgbuild.sh index 13094b5..854c9aa 100755 --- a/pkgbuild.sh +++ b/pkgbuild.sh @@ -14,7 +14,9 @@ cleanup() { unset CONFDEST unset REPO_DEST rm -f "$TMPCONF" - rm -f "$REPO_DIFF" + if ! { [ $# -gt 0 ] && [ "$1" = "--diff" ]; }; then + rm -f "$REPO_DIFF" + fi unset TMPCONF unset REPO_PENDING unset REPO_DIFF @@ -45,7 +47,7 @@ touch "$REPO_DIFF" function get_diff_list { git diff --name-only HEAD^ | while read line; do - if [[ $line =~ $PKGBUILD_DIRECTORY_BASE/\..* ]] && [ $line != "$PKGBUILD_DIRECTORY_BASE/.verified_repos" ]; then + if [[ $line =~ $PKGBUILD_DIRECTORY_BASE/\..+ ]] && [ "$line" != "$PKGBUILD_DIRECTORY_BASE/.verified_repos" ]; then echo "$line" | cut -d'/' -f3 >> "$REPO_DIFF" elif [[ $line =~ $PKGBUILD_DIRECTORY_BASE ]]; then echo "$line" | cut -d'/' -f2 >> "$REPO_DIFF" diff --git a/repo/.yaydeps/glib2-static b/repo/.yaydeps/glib2-static new file mode 100644 index 0000000..d760a00 --- /dev/null +++ b/repo/.yaydeps/glib2-static @@ -0,0 +1 @@ +libselinux -- cgit v1.3.1