aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKunoiSayami <[email protected]>2022-01-22 01:50:40 +0800
committerKunoiSayami <[email protected]>2022-01-22 01:50:40 +0800
commite7e38797f3653e9ce985fe8be1d7af0aa4f72ecb (patch)
treed16238d8d87000d5b042c88ddc040851741f27f6
parentfb178b665db1419d87ef2541f7b2ed1a3df50e4b (diff)
fix(pkg): Fix obs-studio-browser dependency
Signed-off-by: KunoiSayami <[email protected]>
-rwxr-xr-xrepo/.hook/gtk3-classic8
-rw-r--r--repo/.yaydeps/obs-studio-browser2
-rwxr-xr-xutils/pkgbuild.sh7
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"