Always add to build db as we go
This commit is contained in:
1 file changed
+27
-33
+27
-33
@@ -91,7 +91,7 @@ build_package() {
|
|||||||
rm -rf "$pkg"
|
rm -rf "$pkg"
|
||||||
cp -r "/pkgbuilds/$pkg" "$pkg"
|
cp -r "/pkgbuilds/$pkg" "$pkg"
|
||||||
cd "/src/$pkg" || return 1
|
cd "/src/$pkg" || return 1
|
||||||
|
|
||||||
# Get PKGBUILD version (including epoch if present)
|
# Get PKGBUILD version (including epoch if present)
|
||||||
local pkgbuild_version=$(bash -c 'source PKGBUILD; if [[ -n "$epoch" ]]; then echo "${epoch}:${pkgver}-${pkgrel}"; else echo "${pkgver}-${pkgrel}"; fi' 2>/dev/null)
|
local pkgbuild_version=$(bash -c 'source PKGBUILD; if [[ -n "$epoch" ]]; then echo "${epoch}:${pkgver}-${pkgrel}"; else echo "${pkgver}-${pkgrel}"; fi' 2>/dev/null)
|
||||||
|
|
||||||
@@ -129,41 +129,35 @@ build_package() {
|
|||||||
cp "$pkg_file" "$BUILD_OUTPUT_DIR/"
|
cp "$pkg_file" "$BUILD_OUTPUT_DIR/"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
# If this package is a dependency of another package being built,
|
# Update the build database so it's available via pacman
|
||||||
# update the build database so it's available via pacman
|
echo " Updating omarchy-build database..."
|
||||||
if [[ "${INSTALL_PACKAGES[$pkg]}" == "1" ]]; then
|
cd "$BUILD_OUTPUT_DIR"
|
||||||
echo " Updating omarchy-build database (needed as dependency)..."
|
|
||||||
cd "$BUILD_OUTPUT_DIR"
|
# Find the package file we just built (not .sig)
|
||||||
|
local new_pkg=$(ls -t ${pkg}-*.pkg.tar.* 2>/dev/null | grep -v '\.sig$' | head -1)
|
||||||
# Find the package file we just built (not .sig)
|
|
||||||
local new_pkg=$(ls -t ${pkg}-*.pkg.tar.* 2>/dev/null | grep -v '\.sig$' | head -1)
|
if [[ -n "$new_pkg" ]]; then
|
||||||
|
echo " Adding $new_pkg to database..."
|
||||||
if [[ -n "$new_pkg" ]]; then
|
|
||||||
echo " Adding $new_pkg to database..."
|
# Add to omarchy-build database
|
||||||
|
repo-add omarchy-build.db.tar.zst "$new_pkg" 2>&1 | grep -E "==>|error" || true
|
||||||
# Add to omarchy-build database
|
ln -sf omarchy-build.db.tar.zst omarchy-build.db
|
||||||
repo-add omarchy-build.db.tar.zst "$new_pkg" 2>&1 | grep -E "==>|error" || true
|
|
||||||
ln -sf omarchy-build.db.tar.zst omarchy-build.db
|
# Refresh pacman databases so it sees the new package
|
||||||
|
echo " Refreshing pacman database..."
|
||||||
# Sync filesystem to ensure package file is fully written
|
sudo pacman -Sy 2>&1 | grep -E "omarchy-build|error" || true
|
||||||
sync
|
|
||||||
|
# Verify the package is in the database
|
||||||
# Refresh pacman databases so it sees the new package
|
if pacman -Sl omarchy-build 2>/dev/null | grep -q "^omarchy-build $pkg "; then
|
||||||
echo " Refreshing pacman database..."
|
echo " ✓ Package available in omarchy-build repo"
|
||||||
sudo pacman -Sy 2>&1 | grep -E "omarchy-build|error" || true
|
else
|
||||||
|
echo " ⚠ Warning: Package not found in omarchy-build repo"
|
||||||
# Verify the package is in the database
|
|
||||||
if pacman -Sl omarchy-build 2>/dev/null | grep -q "^omarchy-build $pkg "; then
|
|
||||||
echo " ✓ Package available in omarchy-build repo"
|
|
||||||
else
|
|
||||||
echo " ⚠ Warning: Package not found in omarchy-build repo"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd /src/$pkg
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
cd /src/$pkg
|
||||||
|
|
||||||
echo " ✓ Successfully built $pkg"
|
echo " ✓ Successfully built $pkg"
|
||||||
SUCCESSFUL_PACKAGES="$SUCCESSFUL_PACKAGES $pkg"
|
SUCCESSFUL_PACKAGES="$SUCCESSFUL_PACKAGES $pkg"
|
||||||
return 0
|
return 0
|
||||||
|
|||||||
Reference in new issue
Block a user