4b97cd2fb4
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.-][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
20 lines
997 B
Diff
20 lines
997 B
Diff
#reason: fish-shell requires 3rd-party completion files to be installed to vendor_completions.d
|
|
|
|
--- a/mk/shell.mk
|
|
+++ b/mk/shell.mk
|
|
@@ -189,12 +189,12 @@
|
|
.PHONY: install-fish
|
|
install-fish: $(foreach F,$(_AUTO_COMPLETE),bin/$(F).fish-completion)
|
|
@$(PRINTF_INFO) '\e[00;01;31mINSTALL\e[34m %s\e[00m\n' "$@"
|
|
- $(Q)$(INSTALL_DIR) -- "$(DESTDIR)$(DATADIR)/fish/completions"
|
|
+ $(Q)$(INSTALL_DIR) -- "$(DESTDIR)$(DATADIR)/fish/vendor_completions.d"
|
|
ifndef __SHELL_COMMAND
|
|
- $(Q)$(foreach F,$(_AUTO_COMPLETE),$(INSTALL_DATA) bin/$(F).fish-completion -- "$(DESTDIR)$(DATADIR)/fish/completions/$(F).fish" &&) $(TRUE)
|
|
+ $(Q)$(foreach F,$(_AUTO_COMPLETE),$(INSTALL_DATA) bin/$(F).fish-completion -- "$(DESTDIR)$(DATADIR)/fish/vendor_completions.d/$(F).fish" &&) $(TRUE)
|
|
endif
|
|
ifdef __SHELL_COMMAND
|
|
- $(Q)$(INSTALL_DATA) $^ -- "$(DESTDIR)$(DATADIR)/fish/completions/$(COMMAND).fish"
|
|
+ $(Q)$(INSTALL_DATA) $^ -- "$(DESTDIR)$(DATADIR)/fish/vendor_completions.d/$(COMMAND).fish"
|
|
endif
|
|
@$(ECHO_EMPTY)
|
|
|