pkgsrc-WIP-changes archive

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

zlua: install bin/zlua as a symlink, and update MESSAGE



Module Name:	pkgsrc-wip
Committed By:	Dean Matzkov <bapabooiee%gmail.com@localhost>
Pushed By:	bapa
Date:		Sun Mar 1 10:25:50 2020 -0700
Changeset:	dc6e3f1ab6bcfb9c1a8a6caa72e15a8bfd3f5eee

Modified Files:
	zlua/MESSAGE
	zlua/Makefile
	zlua/PLIST

Log Message:
zlua: install bin/zlua as a symlink, and update MESSAGE

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

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

diffstat:
 zlua/MESSAGE  |  9 +++++++--
 zlua/Makefile | 11 +++++------
 zlua/PLIST    |  1 +
 3 files changed, 13 insertions(+), 8 deletions(-)

diffs:
diff --git a/zlua/MESSAGE b/zlua/MESSAGE
index 82cd171ab8..10468dc3a0 100644
--- a/zlua/MESSAGE
+++ b/zlua/MESSAGE
@@ -18,10 +18,15 @@ above with:
 
     z.lua --init bash
 	    -or-
-    z.lua --init fish
-	    -or-
     z.lua --init zsh
 
+To use z.lua with the fish shell, put the following in
+~/.config/fish/init.fish:
+
+    if test -e ${PREFIX}/share/zlua/init.fish
+        source ${PREFIX}/share/zlua/init.fish
+    end
+
 See ${PREFIX}/share/doc/zlua/README.md for more details.
 
 ===========================================================================
diff --git a/zlua/Makefile b/zlua/Makefile
index a47cf1093c..6b72813cfb 100644
--- a/zlua/Makefile
+++ b/zlua/Makefile
@@ -12,7 +12,8 @@ COMMENT=	Lightweight tool that lets you quickly jump around your filesystem
 LICENSE=	mit
 
 NO_BUILD=	yes
-REPLACE_LUA+=	z.lua
+NO_CONFIGURE=	yes
+REPLACE_LUA+=	share/z.lua
 
 # Upstream has no releases, so we don't use ${DISTNAME} here.
 WRKSRC=	${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}
@@ -23,16 +24,14 @@ INSTALLATION_DIRS+=		share/doc/${PKGBASE}
 
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/z.lua ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/z.lua ${DESTDIR}${PREFIX}/share/${PKGBASE}
+	ln -s -f ${PREFIX}/share/${PKGBASE}/z.lua ${DESTDIR}${PREFIX}/bin/z.lua
 	${INSTALL_DATA} ${WRKSRC}/z.lua.plugin.zsh ${DESTDIR}${PREFIX}/share/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/init.fish ${DESTDIR}${PREFIX}/share/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/ranger_zlua.py ${DESTDIR}${PREFIX}/share/${PKGBASE} # Doesn't include Python hashbang at top
+	${INSTALL_DATA} ${WRKSRC}/z.cmd ${DESTDIR}${PREFIX}/share/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/README.cn.md ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
-	# z.cmd is a Batch/.bat script for Windows users. Not terribly useful for Unix-ey users, so into share/ it goes.
-	# Note that we don't use ${INSTALL_SCRIPT} here since being +x'd wouldn't do anything on Windows.
-	${INSTALL_DATA} ${WRKSRC}/z.cmd ${DESTDIR}${PREFIX}/share/${PKGBASE}
-
 .include "../../lang/lua/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/zlua/PLIST b/zlua/PLIST
index 1289bfeeed..57f73435f5 100644
--- a/zlua/PLIST
+++ b/zlua/PLIST
@@ -5,4 +5,5 @@ share/doc/zlua/README.md
 share/zlua/init.fish
 share/zlua/ranger_zlua.py
 share/zlua/z.cmd
+share/zlua/z.lua
 share/zlua/z.lua.plugin.zsh


Home | Main Index | Thread Index | Old Index