pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

docker-cli: avoid conflict with shells/fish



Module Name:	pkgsrc-wip
Committed By:	Maya Rashish <maya%NetBSD.org@localhost>
Pushed By:	coypu
Date:		Sun Sep 7 17:50:44 2025 +0000
Changeset:	bf601cdc793369a6b613edb2fa829db83266e612

Modified Files:
	docker-cli/Makefile
	docker-cli/PLIST

Log Message:
docker-cli: avoid conflict with shells/fish

Both install fish completions for docker.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bf601cdc793369a6b613edb2fa829db83266e612

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 docker-cli/Makefile | 3 ++-
 docker-cli/PLIST    | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs:
diff --git a/docker-cli/Makefile b/docker-cli/Makefile
index aac9749a88..0b7d5f1ec4 100644
--- a/docker-cli/Makefile
+++ b/docker-cli/Makefile
@@ -34,7 +34,8 @@ INSTALLATION_DIRS+=	share/fish/completions
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/docker ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/contrib/completion/bash/docker ${DESTDIR}${PREFIX}/share/bash-completion/completions
-	${INSTALL_DATA} ${WRKSRC}/contrib/completion/fish/docker.fish ${DESTDIR}${PREFIX}/share/fish/completions
+	# Already installed by shells/fish
+	#${INSTALL_DATA} ${WRKSRC}/contrib/completion/fish/docker.fish ${DESTDIR}${PREFIX}/share/fish/completions
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/docker-cli/PLIST b/docker-cli/PLIST
index bc15dd7379..69a8738c03 100644
--- a/docker-cli/PLIST
+++ b/docker-cli/PLIST
@@ -1,4 +1,3 @@
 @comment $NetBSD$
 bin/docker
 share/bash-completion/completions/docker
-share/fish/completions/docker.fish


Home | Main Index | Thread Index | Old Index