From e7e38797f3653e9ce985fe8be1d7af0aa4f72ecb Mon Sep 17 00:00:00 2001 From: KunoiSayami Date: Sat, 22 Jan 2022 01:50:40 +0800 Subject: fix(pkg): Fix obs-studio-browser dependency Signed-off-by: KunoiSayami --- repo/.hook/gtk3-classic | 8 +++++--- repo/.yaydeps/obs-studio-browser | 2 +- utils/pkgbuild.sh | 7 +++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/repo/.hook/gtk3-classic b/repo/.hook/gtk3-classic index 86b4556..dfe442e 100755 --- a/repo/.hook/gtk3-classic +++ b/repo/.hook/gtk3-classic @@ -1,4 +1,6 @@ #!/bin/bash -echo '' | sudo tee -a /etc/pacman.conf >/dev/null -echo 'W211bHRpbGliXQpJbmNsdWRlID0gL2V0Yy9wYWNtYW4uZC9taXJyb3JsaXN0Cgo=' | base64 -d | sudo tee -a /etc/pacman.conf -sudo pacman -Sy +if [ ! -r /var/lib/pacman/sync/multilib.db ]; then + echo '' | sudo tee -a /etc/pacman.conf >/dev/null + echo 'W211bHRpbGliXQpJbmNsdWRlID0gL2V0Yy9wYWNtYW4uZC9taXJyb3JsaXN0Cgo=' | base64 -d | sudo tee -a /etc/pacman.conf + sudo pacman -Sy +fi \ No newline at end of file diff --git a/repo/.yaydeps/obs-studio-browser b/repo/.yaydeps/obs-studio-browser index bbfddca..b1026fd 100644 --- a/repo/.yaydeps/obs-studio-browser +++ b/repo/.yaydeps/obs-studio-browser @@ -1,2 +1,2 @@ -cef-minimal +cef-minimal-obs-studio-browser-bin vlc-luajit diff --git a/utils/pkgbuild.sh b/utils/pkgbuild.sh index 944d15c..0342096 100755 --- a/utils/pkgbuild.sh +++ b/utils/pkgbuild.sh @@ -108,6 +108,13 @@ while read -r FOLDER_NAME ; do 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; } + 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 + # hook must run before other checker hook "$FOLDER_NAME" -- cgit v1.3.1