Unification with community/z: move "/usr/lib/z.sh" to "/usr/share/z/z.sh"

3 files changed, 9 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 508aa48fbabd..739bd0b2fa56 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 # Generated by mksrcinfo v8
-# Mon Sep 17 20:12:35 UTC 2018
+# Tue Jan 15 22:27:03 UTC 2019
 pkgbase = z-git
 	pkgdesc = z keeps track of where you've been and provides a convenient way to jump to directory that you actually use (git version)
 	pkgver = 1.11.7.g9d5a3fe
 	pkgrel = 1
-	url = http://github.com/rupa/z
+	url = https://github.com/rupa/z
 	install = z-git.install
 	arch = any
 	license = WTFPL
diff --git a/PKGBUILD b/PKGBUILD
index 82b535b6ca2a..9efc8daaa09f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=1.11.7.g9d5a3fe
 pkgrel=1
 pkgdesc="z keeps track of where you've been and provides a convenient \
 way to jump to directory that you actually use (git version)"
-url="http://github.com/rupa/z"
+url="https://github.com/rupa/z"
 arch=('any')
 license=('WTFPL')
 depends=('sh')
@@ -29,6 +29,8 @@ pkgver() {
 package() {
   cd $_pkgname
 
-  install -vDm755 z.sh   "$pkgdir/usr/lib/z.sh"
-  install -vDm644 z.1    "$pkgdir/usr/share/man/man1/z.1"
+  # update path in manpage
+  sed -i z.1 -e "s:/path/to/z.sh:/usr/share/z/z.sh:g"
+  install -Dm 644 z.1    "$pkgdir/usr/share/man/man1/z.1"
+  install -Dm 644 z.sh   "$pkgdir/usr/share/z/z.sh"
 }
diff --git a/z-git.install b/z-git.install
index 7258a8602c3b..47a650cfed72 100644
--- a/z-git.install
+++ b/z-git.install
@@ -1,4 +1,4 @@
 post_install() {
-echo "Place The follwing: . /path/to/z.sh"
-echo "In your ~/.bashrc or ~/.zshrc file accordingly."
+  echo 'To use, add the following command to ~/.bashrc or /etc/bash.bashrc or ~/.zshrc:'
+  echo '[[ -r "/usr/share/z/z.sh" ]] && source /usr/share/z/z.sh'
 }