Consolidate more things

This commit is contained in:
Ryan Hughes committed 2025-10-27 00:38:25 -04:00
1 parent 51a3318b10
commit b853ddc51a
13 files changed
+50 -46

No files matched your search

+5 -7
View File
@@ -5,10 +5,7 @@ set -e
BUILD_ROOT=$(realpath "${BASH_SOURCE[0]%/*}/..")
source "$BUILD_ROOT/helpers/message-helpers.sh"
ARCH=${ARCH:-x86_64}
BUILD_OUTPUT_DIR="$BUILD_ROOT/build-output/$ARCH"
FINAL_OUTPUT_DIR="$BUILD_ROOT/pkgs.omarchy.org/$ARCH"
source "$BUILD_ROOT/helpers/paths.sh"
print_header "Promote Build to Production"
@@ -18,6 +15,7 @@ while [[ $# -gt 0 ]]; do
case $1 in
--arch)
ARCH="$2"
update_arch_paths
shift 2
;;
--dry-run)
@@ -43,7 +41,7 @@ while [[ $# -gt 0 ]]; do
done
print_info "Build output: $BUILD_OUTPUT_DIR"
print_info "Final output: $FINAL_OUTPUT_DIR"
print_info "Final output: $REPO_DIR"
# Check if build output exists
if [[ ! -d "$BUILD_OUTPUT_DIR" ]]; then
@@ -72,7 +70,7 @@ if [[ "$DRY_RUN" == true ]]; then
done
else
echo ""
mkdir -p "$FINAL_OUTPUT_DIR"
mkdir -p "$REPO_DIR"
# Copy all package files (excluding build database)
COPIED=0
@@ -81,7 +79,7 @@ else
[[ "$pkg_file" == omarchy-build.db* ]] && continue
if [[ -f "$pkg_file" ]]; then
cp -v "$pkg_file" "$FINAL_OUTPUT_DIR/"
cp -v "$pkg_file" "$REPO_DIR/"
COPIED=$((COPIED + 1))
fi
done