Recognize localrepo and build-end4-deps.sh in package check
This commit is contained in:
@@ -190,6 +190,8 @@ jobs:
|
||||
echo "═══════════════════════════════════════════════════════════════"
|
||||
echo " Checking packages.x86_64 against repos"
|
||||
echo " Allowed repos: cachyos, extra, multilib, chaotic-aur"
|
||||
echo " Also accepted: localrepo/ pre-built packages"
|
||||
echo " Also accepted: packages listed in build-end4-deps.sh"
|
||||
echo "═══════════════════════════════════════════════════════════════"
|
||||
|
||||
ALLOWED_REPOS="^(core|extra|multilib|cachyos|chaotic-aur)$"
|
||||
@@ -202,9 +204,8 @@ jobs:
|
||||
[[ -z "$pkg" || "$pkg" =~ ^# ]] && continue
|
||||
TOTAL=$((TOTAL + 1))
|
||||
|
||||
# Query pacman for the package's repository (all matches, strip \r)
|
||||
# 1) Check allowed repos via pacman
|
||||
repos=$(pacman -Si "$pkg" 2>/dev/null | grep "^Repository" | awk '{print $3}' | tr -d '\r')
|
||||
# Check if ANY of the repos is in the allowed list
|
||||
MATCHED=0
|
||||
for repo in $repos; do
|
||||
if [[ "$repo" =~ $ALLOWED_REPOS ]]; then
|
||||
@@ -213,6 +214,21 @@ jobs:
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
# 2) Check localrepo/ for a pre-built .pkg.tar.zst
|
||||
if [[ $MATCHED -eq 0 ]] && compgen -G "localrepo/${pkg}-*.pkg.tar.zst" > /dev/null 2>&1; then
|
||||
MATCHED=1
|
||||
FOUND=$((FOUND + 1))
|
||||
echo "📦 LOCAL: $pkg (pre-built in localrepo/)"
|
||||
fi
|
||||
|
||||
# 3) Check build-end4-deps.sh for the package name
|
||||
if [[ $MATCHED -eq 0 ]] && grep -qxF "${pkg}" localrepo/build-end4-deps.sh 2>/dev/null; then
|
||||
MATCHED=1
|
||||
FOUND=$((FOUND + 1))
|
||||
echo "📦 BUILD: $pkg (listed in build-end4-deps.sh)"
|
||||
fi
|
||||
|
||||
if [[ $MATCHED -eq 0 ]]; then
|
||||
if [[ -z "$repos" ]]; then
|
||||
echo "❌ MISSING: $pkg"
|
||||
|
||||
@@ -29,7 +29,6 @@ btrfs-progs
|
||||
bully
|
||||
cachyos-keyring
|
||||
cachyos-mirrorlist
|
||||
catppuccin-cursors-macchiato
|
||||
cava
|
||||
celt
|
||||
chaotic-keyring
|
||||
@@ -68,9 +67,6 @@ efibootmgr
|
||||
electron
|
||||
element-desktop
|
||||
espeakup
|
||||
eternalterminal
|
||||
eternalterminal-client
|
||||
eternalterminal-server
|
||||
ethtool
|
||||
exfatprogs
|
||||
f2fs-tools
|
||||
@@ -116,7 +112,6 @@ gpm
|
||||
gptfdisk
|
||||
grml-zsh-config
|
||||
grub
|
||||
grub-customizer
|
||||
gst-plugins-base
|
||||
gst-plugins-ugly
|
||||
gst-plugin-va
|
||||
@@ -207,7 +202,6 @@ mdadm
|
||||
memtest86+
|
||||
memtest86+-efi
|
||||
meson
|
||||
meshy-git
|
||||
mkinitcpio
|
||||
mkinitcpio-archiso
|
||||
mkinitcpio-nfs-utils
|
||||
@@ -252,9 +246,7 @@ open-vm-tools
|
||||
openvpn
|
||||
os-prober
|
||||
otf-font-awesome
|
||||
otf-space-grotesk
|
||||
pacman-contrib
|
||||
pacserve
|
||||
pamixer
|
||||
partclone
|
||||
parted
|
||||
@@ -290,7 +282,6 @@ qemu-guest-agent
|
||||
qt5-quickcontrols2
|
||||
qt6ct
|
||||
qt6-5compat
|
||||
qt6-avif-image-plugin
|
||||
qt6-imageformats
|
||||
qt6-multimedia
|
||||
qt6-positioning
|
||||
@@ -303,7 +294,6 @@ qt6-wayland
|
||||
rclone
|
||||
refind
|
||||
reflector
|
||||
rpi-imager-git
|
||||
rsync
|
||||
rxvt-unicode-terminfo
|
||||
samba
|
||||
@@ -321,16 +311,13 @@ shelly
|
||||
shelly-flatpak-backend
|
||||
shfmt
|
||||
smartmontools
|
||||
snapd
|
||||
sof-firmware
|
||||
sox
|
||||
songrec
|
||||
speech-dispatcher
|
||||
squashfs-tools
|
||||
sshfs
|
||||
ssh-import-id
|
||||
starship
|
||||
steam
|
||||
sudo
|
||||
swaync
|
||||
syncthing
|
||||
@@ -368,9 +355,7 @@ ttf-jetbrains-mono-nerd
|
||||
ttf-material-symbols-variable-git
|
||||
ttf-ms-fonts
|
||||
ttf-readex-pro
|
||||
ttf-rubik-vf
|
||||
ttf-twemoji
|
||||
ttf-victor-mono
|
||||
tty-clock
|
||||
tumbler
|
||||
udftools
|
||||
@@ -378,7 +363,6 @@ uget
|
||||
umockdev
|
||||
unrar
|
||||
upower
|
||||
upscayl-bin
|
||||
uriparser
|
||||
usbguard
|
||||
usb_modeswitch
|
||||
@@ -392,7 +376,6 @@ vim
|
||||
virt-manager
|
||||
virtualbox-guest-utils-nox
|
||||
vpnc
|
||||
wallust
|
||||
wayland-protocols
|
||||
wine
|
||||
winetricks
|
||||
@@ -409,7 +392,6 @@ xdg-user-dirs
|
||||
xdotool
|
||||
xfsprogs
|
||||
xl2tpd
|
||||
xwaylandvideobridge
|
||||
yay
|
||||
ydotool
|
||||
yt-dlp
|
||||
|
||||
Reference in New Issue
Block a user