Allow site-functions instead of site-contrib throughout

vaeth · Feb 9, 2020 · 350acb8 · 350acb8
1 parent e2ec7c7
commit 350acb8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -92,9 +92,10 @@ they exist:
 -	`$DEFAULTS/zsh/help`
 -	`$EPREFIX/usr/share/zsh/$ZSH_VERSION/help`
 -	`$EPREFIX/usr/share/zsh/site-contrib/help`
+-	`$EPREFIX/usr/share/zsh/site-functions/help`
 
 	This substitutes `/usr/share/zsh/$ZSH_VERSION/help` or
-	`/usr/share/size-contrib/help`.
+	`/usr/share/size-contrib/help` or `/usr/share/size-functions/help`.
 	The content should be generated with the `Util/helpfiles` script
 	as described in the __zsh__ manpage.
 
@@ -124,11 +125,11 @@ they exist:
 
 -	`$DEFAULTS[/zsh][/zsh-autosuggestions]/zsh-autosuggestions.zsh`
 -	`$GITS[/zsh-autosuggestions[.git]]/zsh-autosuggestions.zsh`
--	`$EPREFIX/usr/share/zsh/site-contrib[/zsh-autosuggestions]/zsh-autosuggestions.zsh`
+-	`$EPREFIX/usr/share/zsh/site-[contrib|functions][/zsh-autosuggestions]/zsh-autosuggestions.zsh`
 
 	This substitutes the corresponding file in
-	`/usr/share/zsh/site-contrib`. Fallback is to use `$PATH`.
-	Download e.g. with
+	`/usr/share/zsh/site-contrib` or `/usr/share/zsh/site-functions`.
+	Fallback is to use `$PATH`. Download e.g. with
 
 	`git clone https://github.com/zsh-users/zsh-autosuggesitons.git`
 
@@ -141,11 +142,11 @@ they exist:
 
 -	`$DEFAULTS[/zsh][auto-fu[.zsh]]/auto-fu[.zsh]`
 -	`$GITS[/auto-fu[.zsh][.git]]/auto-fu[.zsh]`
--	`$EPREFIX/usr/share/zsh/site-contrib[/auto-fu[.zsh]]/auto-fu[.zsh]`
+-	`$EPREFIX/usr/share/zsh/site-[contrib|functions][/auto-fu[.zsh]]/auto-fu[.zsh]`
 
 	This substitutes the corresponding file in
-	`/usr/share/zsh/site-contrib`. Fallback is to use `$PATH`.
-	Download e.g. with
+	`/usr/share/zsh/site-contrib` or `/usr/share/zsh/site-functions`.
+	Fallback is to use `$PATH`. Download e.g. with
 
 	`git clone https://github.com/hchbaw/auto-fu.zsh.git`
 
@@ -161,10 +162,10 @@ they exist:
 
 -	`$DEFAULTS[/zsh][/fast-syntax-highlighting]/fast-syntax-highlighting.plugin.zsh`
 -	`$GITS[/fast-syntax-highlighting[.git]]/fast-syntax-highlighting.plugin.zsh`
--	`$EPREFIX/usr/share/zsh/site-contrib[/fast-syntax-highlighting]/fast-syntax-highlighting.plugin.zsh`
+-	`$EPREFIX/usr/share/zsh/site-[contrib|functions][/fast-syntax-highlighting]/fast-syntax-highlighting.plugin.zsh`
 
 	This substitutes the corresponding file in
-	`/usr/share/zsh/site-contrib` if available.
+	`/usr/share/zsh/site-contrib` or `/usr/share/zsh/site-functions`.
 	Fallback is to use `$PATH`. Download e.g. with
 
 	`git clone https://github.com/zdharma/fast-syntax-highlighting.git`
@@ -173,10 +174,10 @@ they exist:
 
 -	`$DEFAULTS[/zsh][/zsh-syntax-highlighting]/zsh-syntax-highlighting.zsh`
 -	`$GITS[/zsh-syntax-highlighting[.git]]/zsh-syntax-highlighting.zsh`
--	`$EPREFIX/usr/share/zsh/site-contrib[/zsh-syntax-highlighting]/zsh-syntax-highlighting.zsh`
+-	`$EPREFIX/usr/share/zsh/site-[contrib|functions][/zsh-syntax-highlighting]/zsh-syntax-highlighting.zsh`
 
 	This substitutes the corresponding file in
-	`/usr/share/zsh/site-contrib` if available.
+	`/usr/share/zsh/site-contrib` or `/usr/share/zsh/site-functions`.
 	Fallback is to use `$PATH`. Download e.g. with
 
 	`git clone https://github.com/zsh-users/zsh-syntax-highlighting.git`

diff --git a/zshrc b/zshrc
@@ -209,9 +209,9 @@ autoload -Uz colors zargs zcalc zed zmv
 for HELPDIR in \
 	${DEFAULTS:+${^DEFAULTS%/}/zsh{-,/}help} \
 	${EPREFIX:+${^EPREFIX%/}/usr/share/zsh/$ZSH_VERSION/help} \
-	${EPREFIX:+${^EPREFIX%/}/usr/share/zsh/site-contrib/help} \
+	${EPREFIX:+${^EPREFIX%/}/usr/share/zsh/site-{contrib,functions}/help} \
 	/usr/share/zsh/$ZSH_VERSION/help \
-	/usr/share/zsh/site-contrib/help
+	/usr/share/zsh/site-{contrib,functions}/help
 do	[[ -d $HELPDIR ]] && {
 		alias run-help NUL && unalias run-help
 		autoload -Uz run-help
@@ -698,8 +698,8 @@ zshrc_fast_syntax_highlighting() {
 		local i j
 		j=(${DEFAULTS:+${^DEFAULTS%/}{,/zsh}{/fast-syntax-highlighting,}}
 		${GITS:+${^GITS%/}{/fast-syntax-highlighting{.git,},}}
-		${EXPREFIX:+${^EPREFIX%/}/usr/share/zsh/site-contrib{/fast-syntax-highlighting,}}
-		/usr/share/zsh/site-contrib{/fast-syntax-highlighting,}
+		${EXPREFIX:+${^EPREFIX%/}/usr/share/zsh/site-{contrib,functions}{/fast-syntax-highlighting,}}
+		/usr/share/zsh/site-{contrib,functions}{/fast-syntax-highlighting,}
 		$path)
 		for i in $j
 		do	. $i/fast-syntax-highlighting.plugin.zsh NIL && return
@@ -715,8 +715,8 @@ zshrc_zsh_syntax_highlighting() {
 	(($+ZSH_HIGHLIGHT_HIGHLIGHTERS)) || path=(
 		${DEFAULTS:+${^DEFAULTS%/}{,/zsh}{/zsh-syntax-highlighting,}}
 		${GITS:+${^GITS%/}{/zsh-syntax-highlighting{.git,},}}
-		${EXPREFIX:+${^EPREFIX%/}/usr/share/zsh/site-contrib{/zsh-syntax-highlighting,}}
-		/usr/share/zsh/site-contrib{/zsh-syntax-highlighting,}
+		${EXPREFIX:+${^EPREFIX%/}/usr/share/zsh/site-{contrib,functions}{/zsh-syntax-highlighting,}}
+		/usr/share/zsh/site-{contrib,functions}{/zsh-syntax-highlighting,}
 		$path
 	) . zsh-syntax-highlighting.zsh NIL || return
 	typeset -gUa ZSH_HIGHLIGHT_HIGHLIGHTERS
@@ -896,8 +896,8 @@ zshrc_autosuggestions() {
 	(($+ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE)) || path=(
 		${DEFAULTS:+${^DEFAULTS%/}{,/zsh}{/zsh-autosuggestions,}}
 		${GITS:+${^GITS%/}{/zsh-autosuggestions{.git,},}}
-		${EXPREFIX:+${^EPREFIX%/}/usr/share/zsh/site-contrib{/zsh-autosuggestions,}}
-		/usr/share/zsh/site-contrib{/zsh-autosuggestions,}
+		${EXPREFIX:+${^EPREFIX%/}/usr/share/zsh/site-{contrib,functions}{/zsh-autosuggestions,}}
+		/usr/share/zsh/site-{contrib,functions}{/zsh-autosuggestions,}
 		$path) . zsh-autosuggestions.zsh NIL || return
 	if [[ $(echotc Co) -ge 256 ]]
 	then	ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=99,bold,bg=18'
@@ -943,8 +943,8 @@ zshrc_auto_fu() {
 	(($+functions[auto-fu-init])) || path=(
 		${DEFAULTS:+${^DEFAULTS%/}{,/zsh}{/auto-fu{.zsh,},}}
 		${GITS:+${^GITS%/}{/auto-fu{.zsh,}{.git,},}}
-		${EPREFIX:+${^EPREFIX%/}/usr/share/zsh/site-contrib{/auto-fu{.zsh,},}}
-		/usr/share/zsh/site-contrib{/auto-fu{.zsh,},}
+		${EPREFIX:+${^EPREFIX%/}/usr/share/zsh/site-{contrib,functions}{/auto-fu{.zsh,},}}
+		/usr/share/zsh/site-{contrib,functions}{/auto-fu{.zsh,},}
 		$path
 	) zshrc_auto_fu_load || return
 	unset ZSHRC_AUTO_ACCEPT