Replace scheduled AUR imports with direct upstream watches
This commit is contained in:
1 parent
f26a60aef7
commit
b34de5c29e
115 files changed
+2155
-1242
No files matched your search
@@ -17,13 +17,13 @@ Usage: $0 <package> [OPTIONS]
|
||||
Create a scratch workspace for inspecting an AUR-backed package.
|
||||
|
||||
The workspace contains:
|
||||
upstream/ Raw AUR package at .omarchy/package.json upstream_commit, or HEAD
|
||||
upstream/ Raw AUR package at the recorded origin.commit, or HEAD
|
||||
patched/ Raw AUR package with Omarchy .omarchy patches/hooks/pkgrel applied
|
||||
current/ Current checked-in package directory
|
||||
|
||||
Options:
|
||||
--dir <path> Workspace directory (default: mktemp under /tmp)
|
||||
--commit <sha> Use a specific AUR commit instead of upstream_commit
|
||||
--commit <sha> Use a specific AUR commit instead of origin.commit
|
||||
-h, --help Show this help message
|
||||
|
||||
Examples:
|
||||
@@ -75,13 +75,13 @@ if [[ ! -f "$METADATA" ]]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ "$(jq -r '.source // ""' "$METADATA")" != "aur" ]]; then
|
||||
if [[ "$(jq -r '.origin.aur // .aur // (if .source == "aur" then "legacy" else "" end)' "$METADATA")" == "" ]]; then
|
||||
print_error "package-worktree only supports AUR-backed packages"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
AUR_PACKAGE=$(jq -r --arg package "$PACKAGE" '.aur // $package' "$METADATA")
|
||||
UPSTREAM_COMMIT=${COMMIT_OVERRIDE:-$(jq -r '.upstream_commit // ""' "$METADATA")}
|
||||
AUR_PACKAGE=$(jq -r --arg package "$PACKAGE" '.origin.aur // .aur // $package' "$METADATA")
|
||||
UPSTREAM_COMMIT=${COMMIT_OVERRIDE:-$(jq -r '.origin.commit // .upstream_commit // ""' "$METADATA")}
|
||||
|
||||
if [[ -z "$DEST_DIR" ]]; then
|
||||
DEST_DIR=$(mktemp -d "${TMPDIR:-/tmp}/omarchy-${PACKAGE}.XXXXXX")
|
||||
@@ -224,7 +224,7 @@ print_info "AUR package: $AUR_PACKAGE"
|
||||
if [[ -n "$UPSTREAM_COMMIT" ]]; then
|
||||
print_info "Upstream commit: $UPSTREAM_COMMIT"
|
||||
else
|
||||
print_warning "No upstream_commit recorded; using AUR HEAD"
|
||||
print_warning "No origin.commit recorded; using AUR HEAD"
|
||||
fi
|
||||
|
||||
rm -rf "$UPSTREAM_DIR" "$PATCHED_DIR" "$CURRENT_DIR"
|
||||
|
||||
Reference in new issue
Block a user