Update based on package version from info
This commit is contained in:
Ryan Hughes committed
1 parent
2ad6cd90bb
commit
889f3818fc
1 file changed
+131
-126
+131
-126
@@ -1,136 +1,141 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# AUR package building functions
|
# AUR package building functions
|
||||||
|
|
||||||
|
# Get version from local repo database
|
||||||
|
get_local_version() {
|
||||||
|
local pkg="$1"
|
||||||
|
if [[ -f /output/omarchy.db.tar.zst ]]; then
|
||||||
|
# First find the exact desc file for this package (not package-debug, etc)
|
||||||
|
# Pattern matches: package-version/desc where version starts with a number
|
||||||
|
local desc_file=$(tar -tf /output/omarchy.db.tar.zst | grep "^${pkg}-[0-9].*/desc$" | head -1)
|
||||||
|
|
||||||
|
if [[ -n "$desc_file" ]]; then
|
||||||
|
# Extract that specific file and get the version
|
||||||
|
tar -xOf /output/omarchy.db.tar.zst "$desc_file" 2>/dev/null |
|
||||||
|
awk '/%VERSION%/{getline; print; exit}'
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
# Simple function to build an AUR package
|
# Simple function to build an AUR package
|
||||||
build_aur_package() {
|
build_aur_package() {
|
||||||
local pkg="$1"
|
local pkg="$1"
|
||||||
local opts="$2"
|
local opts="$2"
|
||||||
|
|
||||||
echo " -> Building $pkg..."
|
echo " -> Processing $pkg..."
|
||||||
cd /src
|
|
||||||
|
# Get version from AUR API (also gets package base)
|
||||||
# Case 1: Directory exists with PKGBUILD - check for updates
|
local aur_info=$(curl -s "https://aur.archlinux.org/rpc/?v=5&type=info&arg[]=$pkg")
|
||||||
if [[ -d "$pkg" ]] && [[ -f "$pkg/PKGBUILD" ]]; then
|
local aur_version=$(echo "$aur_info" | jq -r '.results[0].Version // empty')
|
||||||
cd "$pkg"
|
local pkg_base=$(echo "$aur_info" | jq -r '.results[0].PackageBase // empty')
|
||||||
|
|
||||||
# Store current commit before pull
|
if [[ -z "$aur_version" ]]; then
|
||||||
OLD_COMMIT=$(git rev-parse HEAD 2>/dev/null || echo "none")
|
echo " Package not found in AUR"
|
||||||
|
FAILED_PACKAGES="$FAILED_PACKAGES $pkg"
|
||||||
# Try to pull updates
|
return 1
|
||||||
git pull --quiet
|
fi
|
||||||
|
|
||||||
# Get new commit after pull
|
# Use package name as base if not specified
|
||||||
NEW_COMMIT=$(git rev-parse HEAD 2>/dev/null || echo "none")
|
if [[ -z "$pkg_base" ]]; then
|
||||||
|
pkg_base="$pkg"
|
||||||
# Determine if we need to build
|
elif [[ "$pkg_base" != "$pkg" ]]; then
|
||||||
if [[ "$FORCE_REBUILD" == "true" ]]; then
|
echo " Using package base: $pkg_base"
|
||||||
echo " Forcing rebuild..."
|
fi
|
||||||
elif [[ "$OLD_COMMIT" != "$NEW_COMMIT" ]]; then
|
|
||||||
echo " Updates found, rebuilding..."
|
# Check if we need to build
|
||||||
else
|
local local_version=$(get_local_version "$pkg")
|
||||||
echo " No updates found, skipping"
|
|
||||||
return 0
|
if [[ "$FORCE_REBUILD" == "true" ]]; then
|
||||||
fi
|
echo " Forcing rebuild (AUR: $aur_version)"
|
||||||
|
elif [[ "$local_version" == "$aur_version" ]]; then
|
||||||
# Case 2: Directory exists but no PKGBUILD - reclone
|
echo " Up to date: $local_version - Skipping build"
|
||||||
elif [[ -d "$pkg" ]]; then
|
return 0
|
||||||
echo " Incomplete clone detected, removing and recloning..."
|
elif [[ -n "$local_version" ]]; then
|
||||||
rm -rf "$pkg"
|
echo " Update available: $local_version -> $aur_version"
|
||||||
git clone "https://aur.archlinux.org/${pkg}.git" || {
|
else
|
||||||
echo " Failed to clone $pkg"
|
echo " Not built yet (AUR: $aur_version)"
|
||||||
FAILED_PACKAGES="$FAILED_PACKAGES $pkg"
|
fi
|
||||||
return 1
|
|
||||||
}
|
# Always fresh clone when building
|
||||||
cd "$pkg"
|
cd /src
|
||||||
|
rm -rf "$pkg"
|
||||||
# Case 3: Directory doesn't exist - clone
|
|
||||||
else
|
git clone "https://aur.archlinux.org/${pkg_base}.git" "$pkg" || {
|
||||||
# Get the package base from AUR RPC (some packages have different repo names)
|
echo " Failed to clone $pkg_base"
|
||||||
local pkg_base=$(curl -s "https://aur.archlinux.org/rpc/?v=5&type=info&arg[]=$pkg" | jq -r '.results[0].PackageBase // empty')
|
FAILED_PACKAGES="$FAILED_PACKAGES $pkg"
|
||||||
|
return 1
|
||||||
# Fall back to package name if API call fails or returns nothing
|
}
|
||||||
if [[ -z "$pkg_base" ]]; then
|
|
||||||
pkg_base="$pkg"
|
cd "$pkg"
|
||||||
elif [[ "$pkg_base" != "$pkg" ]]; then
|
|
||||||
echo " Using package base: $pkg_base"
|
# Build package
|
||||||
fi
|
MAKEPKG_FLAGS="-sc --noconfirm"
|
||||||
|
|
||||||
git clone "https://aur.archlinux.org/${pkg_base}.git" "$pkg" || {
|
# Check for skip-pgp in options or global SKIP_PGP
|
||||||
echo " Failed to clone $pkg"
|
if [[ "$SKIP_PGP" == "true" ]] || [[ "$opts" == *"skip-pgp"* ]]; then
|
||||||
FAILED_PACKAGES="$FAILED_PACKAGES $pkg"
|
MAKEPKG_FLAGS="$MAKEPKG_FLAGS --skippgpcheck"
|
||||||
return 1
|
echo " (skipping PGP verification)"
|
||||||
}
|
fi
|
||||||
cd "$pkg"
|
|
||||||
|
if gpg --list-secret-keys 2>/dev/null | grep -q "sec"; then
|
||||||
|
makepkg $MAKEPKG_FLAGS --sign || {
|
||||||
|
echo " Failed to build $pkg"
|
||||||
|
FAILED_PACKAGES="$FAILED_PACKAGES $pkg"
|
||||||
|
cd /src
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
else
|
||||||
|
makepkg $MAKEPKG_FLAGS || {
|
||||||
|
echo " Failed to build $pkg"
|
||||||
|
FAILED_PACKAGES="$FAILED_PACKAGES $pkg"
|
||||||
|
cd /src
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Copy to output and add to temporary build repo
|
||||||
|
for pkg_file in *.pkg.tar.*; do
|
||||||
|
if [[ -f "$pkg_file" ]] && [[ "$pkg_file" != *.sig ]]; then
|
||||||
|
cp "$pkg_file" /output/
|
||||||
|
# Add to temporary repo database (pointing to /output files)
|
||||||
|
repo-add /tmp/build-repo/omarchy-build.db.tar.gz "/output/$pkg_file"
|
||||||
fi
|
fi
|
||||||
|
done
|
||||||
# Build package
|
|
||||||
MAKEPKG_FLAGS="-sc --noconfirm"
|
# Update pacman database to see new packages
|
||||||
|
sudo pacman -Sy
|
||||||
# Check for skip-pgp in options or global SKIP_PGP
|
|
||||||
if [[ "$SKIP_PGP" == "true" ]] || [[ "$opts" == *"skip-pgp"* ]]; then
|
echo " Successfully built $pkg"
|
||||||
MAKEPKG_FLAGS="$MAKEPKG_FLAGS --skippgpcheck"
|
cd /src
|
||||||
echo " (skipping PGP verification)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if gpg --list-secret-keys 2>/dev/null | grep -q "sec"; then
|
|
||||||
makepkg $MAKEPKG_FLAGS --sign || {
|
|
||||||
echo " Failed to build $pkg"
|
|
||||||
FAILED_PACKAGES="$FAILED_PACKAGES $pkg"
|
|
||||||
cd /src
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
else
|
|
||||||
makepkg $MAKEPKG_FLAGS || {
|
|
||||||
echo " Failed to build $pkg"
|
|
||||||
FAILED_PACKAGES="$FAILED_PACKAGES $pkg"
|
|
||||||
cd /src
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Copy to output and add to temporary build repo
|
|
||||||
for pkg_file in *.pkg.tar.*; do
|
|
||||||
if [[ -f "$pkg_file" ]] && [[ "$pkg_file" != *.sig ]]; then
|
|
||||||
cp "$pkg_file" /output/
|
|
||||||
# Add to temporary repo database (pointing to /output files)
|
|
||||||
repo-add /tmp/build-repo/omarchy-build.db.tar.gz "/output/$pkg_file"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# Update pacman database to see new packages
|
|
||||||
sudo pacman -Sy
|
|
||||||
|
|
||||||
echo " Successfully built $pkg"
|
|
||||||
cd /src
|
|
||||||
}
|
}
|
||||||
|
|
||||||
build_aur_packages() {
|
build_aur_packages() {
|
||||||
# Work in the mounted src directory
|
# Work in the mounted src directory
|
||||||
cd /src
|
cd /src
|
||||||
|
|
||||||
FAILED_PACKAGES=""
|
FAILED_PACKAGES=""
|
||||||
|
|
||||||
if [[ -s /tmp/packages.aur ]]; then
|
if [[ -s /tmp/packages.aur ]]; then
|
||||||
echo "==> Building AUR packages..."
|
echo "==> Building AUR packages..."
|
||||||
while IFS= read -r line || [ -n "$line" ]; do
|
while IFS= read -r line || [ -n "$line" ]; do
|
||||||
[[ "$line" =~ ^#.*$ ]] && continue
|
[[ "$line" =~ ^#.*$ ]] && continue
|
||||||
[[ -z "$line" ]] && continue
|
[[ -z "$line" ]] && continue
|
||||||
|
|
||||||
# Parse package name and options
|
# Parse package name and options
|
||||||
package=$(echo "$line" | awk '{print $1}')
|
package=$(echo "$line" | awk '{print $1}')
|
||||||
options=$(echo "$line" | awk '{$1=""; print $0}' | xargs)
|
options=$(echo "$line" | awk '{$1=""; print $0}' | xargs)
|
||||||
|
|
||||||
# Build the package
|
# Build the package
|
||||||
build_aur_package "$package" "$options"
|
build_aur_package "$package" "$options"
|
||||||
done < /tmp/packages.aur
|
done </tmp/packages.aur
|
||||||
|
|
||||||
# Report failures at the end
|
# Report failures at the end
|
||||||
if [[ -n "$FAILED_PACKAGES" ]]; then
|
if [[ -n "$FAILED_PACKAGES" ]]; then
|
||||||
echo ""
|
echo ""
|
||||||
echo "==> Failed packages:"
|
echo "==> Failed packages:"
|
||||||
for pkg in $FAILED_PACKAGES; do
|
for pkg in $FAILED_PACKAGES; do
|
||||||
echo " - $pkg"
|
echo " - $pkg"
|
||||||
done
|
done
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
}
|
fi
|
||||||
|
}
|
||||||
Reference in new issue
Block a user