diff --git a/builder/build-omarchy-packages.sh b/builder/build-omarchy-packages.sh index 33e727d..956e76b 100755 --- a/builder/build-omarchy-packages.sh +++ b/builder/build-omarchy-packages.sh @@ -38,12 +38,8 @@ if [ -n "$OMARCHY_DEV_BUILD" ] && [ -d "/omarchy-installer" ]; then source /builder/templates/dev-pkgbuild-patch.sh convert_to_dev_pkgbuild "PKGBUILD" - # Ensure local source is accessible - mkdir -p src - ln -sf /omarchy-installer src/omarchy-installer - BUILD_FILE="PKGBUILD.dev" - BUILD_FLAGS="--noconfirm --skippgpcheck --skipchecksums --noextract" + BUILD_FLAGS="--noconfirm --skippgpcheck --skipchecksums -f" echo "✓ Will build from local source (no git clone)" else echo "=========================================" @@ -120,12 +116,8 @@ if [ -n "$OMARCHY_DEV_BUILD" ] && [ -d "/omarchy-installer" ]; then source /builder/templates/dev-pkgbuild-patch.sh convert_to_dev_pkgbuild "PKGBUILD" - # Symlink local source - mkdir -p src - ln -sf /omarchy-installer src/omarchy-installer - INSTALLER_BUILD_FILE="PKGBUILD.dev" - INSTALLER_BUILD_FLAGS="--noconfirm --skippgpcheck --skipchecksums --noextract" + INSTALLER_BUILD_FLAGS="--noconfirm --skippgpcheck --skipchecksums -f" else echo "PRODUCTION MODE: Using git source" INSTALLER_BUILD_FILE="PKGBUILD" @@ -167,12 +159,8 @@ if [ -n "$OMARCHY_DEV_BUILD" ] && [ -d "/omarchy-installer" ]; then source /builder/templates/dev-pkgbuild-patch.sh convert_to_dev_pkgbuild "PKGBUILD" - # Symlink local source - mkdir -p src - ln -sf /omarchy-installer src/omarchy-installer - OMARCHY_BUILD_FILE="PKGBUILD.dev" - OMARCHY_BUILD_FLAGS="--noconfirm --skippgpcheck --skipchecksums --noextract" + OMARCHY_BUILD_FLAGS="--noconfirm --skippgpcheck --skipchecksums -f" else echo "PRODUCTION MODE: Using git source" OMARCHY_BUILD_FILE="PKGBUILD" diff --git a/builder/templates/dev-pkgbuild-patch.sh b/builder/templates/dev-pkgbuild-patch.sh index 4a6ee6e..72c1a08 100755 --- a/builder/templates/dev-pkgbuild-patch.sh +++ b/builder/templates/dev-pkgbuild-patch.sh @@ -15,25 +15,9 @@ convert_to_dev_pkgbuild() { sed -i '/^source=/c\source=()' "$dev_pkgbuild_path" sed -i '/^sha256sums=/c\sha256sums=()' "$dev_pkgbuild_path" - # Add prepare() function to symlink local source - # Insert after the source line - cat >> "$dev_pkgbuild_path" << 'EOF' - -# Dev build: use locally mounted source -prepare() { - # Symlink local omarchy-installer source - if [ -d "/omarchy-installer" ]; then - ln -sf /omarchy-installer "$srcdir/omarchy-installer" - echo "Using locally mounted omarchy-installer from /omarchy-installer" - elif [ -f "/omarchy-pkgs/pkgbuilds/omarchy-settings/src/omarchy-installer" ]; then - # Fallback: use source from previous build - echo "Using omarchy-installer from previous package build" - else - error "No local omarchy-installer source found!" - return 1 - fi -} -EOF + # Replace cd "omarchy-installer" with cd "/omarchy-installer" to use mounted directory directly + sed -i 's|cd "omarchy-installer"|cd "/omarchy-installer"|g' "$dev_pkgbuild_path" echo "✓ Dev PKGBUILD created: $dev_pkgbuild_path" + echo "✓ Will use /omarchy-installer directly (no git clone, no symlinks)" }