sync: store ninja.build in XDG_RUNTIME_DIR/aurutils

pull/1010/head
Alad Wenter 3 months ago
parent e74794b64f
commit 25b4f69837
  1. 5
      lib/aur-sync
  2. 5
      makepkg/aurutils.changelog

@ -6,6 +6,7 @@ argv0=sync
XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-$HOME/.config}
XDG_DATA_HOME=${XDG_DATA_HOME:-$HOME/.local/share}
XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR:-/run/user/$UID}
AURDEST=${AURDEST:-$XDG_CACHE_HOME/aurutils/$argv0}
AUR_SYNC_USE_NINJA=${AUR_SYNC_USE_NINJA:-0}
PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
@ -420,8 +421,8 @@ fi
# Build dependency tree with ninja (#908)
if (( AUR_SYNC_USE_NINJA )); then
# directory for stamp files (concurrent aur-sync processes)
# XXX: better way to disambiguate (e.g date, uuid)
build_dir=ninja-$USER-$$
mkdir -p "$XDG_RUNTIME_DIR"/aurutils
build_dir=$XDG_RUNTIME_DIR/aurutils/ninja-$USER-$$
mkdir "$build_dir"
# generate build.ninja

@ -18,8 +18,8 @@
- fix a bug where setting `aurutils.rebase` affected unrelated targets
- set default author for merge commits to `aurutils@localhost`
+ `--sync=auto` now preserves local changes by default
- `--discard` (`-f`) resets the repository on new upstream commits
+ add `--reset`, `--rebase`, `--auto` aliases for `--sync=reset`, `--sync=rebase`, `--sync=auto`
- `--discard` (`-f`) resets the branch on new upstream commits
+ add `--reset`, `--rebase`, `--auto` (`--sync=reset`, `--sync=rebase`, `--sync=auto`)
+ support multiple branches, with commits merged from `origin/master`
* `aur-pkglist`
@ -47,6 +47,7 @@
+ add `--rebase`, `--reset` options for `aur-fetch`
+ exit 22 on dependency cycles (v7 regression)
+ filter dependency graph by pkgname, not depends (v7 regression)
+ store `build.ninja` files in `$XDG_RUNTIME_DIR/aurutils`
## 9.6

Loading…
Cancel
Save