aboutsummaryrefslogtreecommitdiff
path: root/completion
diff options
context:
space:
mode:
authorkitsunyan2018-05-05 12:52:23 +0000
committerkitsunyan2018-05-05 12:52:23 +0000
commit4b07b34b80ecbf8cfb88945a56ce021525b74741 (patch)
tree6b05af865055e3a3278c3be2511aaec43d7949e9 /completion
parentdbe10af0544069641f48cee263717eff68dee07e (diff)
Add patches for pacman completions from git
Diffstat (limited to 'completion')
l---------completion/bash-git.patch1
-rwxr-xr-xcompletion/make.sh12
-rw-r--r--completion/zsh-git.patch50
3 files changed, 61 insertions, 2 deletions
diff --git a/completion/bash-git.patch b/completion/bash-git.patch
new file mode 120000
index 0000000..7f0241d
--- /dev/null
+++ b/completion/bash-git.patch
@@ -0,0 +1 @@
+bash.patch \ No newline at end of file
diff --git a/completion/make.sh b/completion/make.sh
index 323dad6..b8f0d47 100755
--- a/completion/make.sh
+++ b/completion/make.sh
@@ -10,6 +10,14 @@ function error() {
}
function apply-patch() {
+ for f in "$@"; do
+ patch -sNp1 --dry-run -i "$f" > /dev/null && {
+ patch -sNp1 -r - --no-backup-if-mismatch -i "$f"
+ return "$?"
+ }
+ done
+
+ # show error applying first patch
patch -sNp1 -r - --no-backup-if-mismatch -i "$1"
}
@@ -30,7 +38,7 @@ function delete-shell-array() {
> 'bash' ||
error 'bash'
- apply-patch 'bash.patch' ||
+ apply-patch 'bash.patch' 'bash-git.patch' ||
error 'bash'
exit 0
@@ -51,7 +59,7 @@ function delete-shell-array() {
> 'zsh' ||
error 'zsh'
- apply-patch 'zsh.patch' ||
+ apply-patch 'zsh.patch' 'zsh-git.patch' ||
error 'zsh'
exit 0
diff --git a/completion/zsh-git.patch b/completion/zsh-git.patch
new file mode 100644
index 0000000..adf7edd
--- /dev/null
+++ b/completion/zsh-git.patch
@@ -0,0 +1,50 @@
+--- a/zsh
++++ b/zsh
+@@ -1,1 +1,1 @@
+-#compdef pacman pacman.static=pacman pacman-key makepkg
++#compdef pakku
+@@ -139,2 +139,6 @@
+ '--print-format[Specify how the targets should be printed]'
++ {-n,--build}'[Build targets from source]'
++ '--keyserver[Keyserver to receive keys from]'
++ '--noaur[Disable all AUR operations]'
++ {-z,--source}'[Retrieve PKGBUILD source]'
+ )
+@@ -310,1 +314,6 @@
+- packages=( $(_call_program packages $cmd[@] -Sql ${words[CURRENT]%/*}) )
++ if [[ ${words[CURRENT]%/*} == 'aur' ]]; then
++ packages=( $(_call_program packages $cmd[@] -Ss ${words[CURRENT]#*/} |
++ grep -Po '(?<=^aur/)[^ ]+') )
++ else
++ packages=( $(_call_program packages $cmd[@] -Sql ${words[CURRENT]%/*}) )
++ fi
+@@ -314,1 +323,1 @@
+- packages=( $(_call_program packages $cmd[@] -Sql) )
++ packages=( $(_call_program packages $cmd[@] -Ssq ${words[CURRENT]}) )
+@@ -318,1 +327,1 @@
+- repositories=($(pacman-conf --repo-list))
++ repositories=($(pacman-conf --repo-list) aur)
+@@ -361,1 +370,1 @@
+- cmd=( "pacman" "2>/dev/null")
++ cmd=("pakku" "2>/dev/null")
+@@ -371,1 +380,1 @@
+-_pakku_zsh_comp() {
++_pakku_comp() {
+@@ -501,17 +510,0 @@
+-
+-_pakku_comp() {
+- case "$service" in
+- makepkg)
+- _makepkg "$@"
+- ;;
+- pacman-key)
+- _pakku_key "$@"
+- ;;
+- pacman)
+- _pakku_zsh_comp "$@"
+- ;;
+- *)
+- _message "Error"
+- ;;
+- esac
+-}