summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTatsuyuki Ishi2017-10-18 13:00:47 +0900
committerTatsuyuki Ishi2017-10-18 13:01:05 +0900
commitf06ce5a11f1ac071c306bf54f1f51e225f530428 (patch)
tree42f59c9c1f1f220259ccb94c8185d2838d45065e
parentc082f63fde8d4ff5e274e565ffbd6aae3210e41d (diff)
downloadaur-f06ce5a11f1ac071c306bf54f1f51e225f530428.tar.gz
Adopt new install scheme
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD19
-rw-r--r--zshrc14
3 files changed, 28 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0ea36a0fc342..8e4f374dcb78 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Fri Jun 9 12:44:51 UTC 2017
+# Wed Oct 18 04:01:03 UTC 2017
pkgbase = zsh-zim-git
pkgdesc = ZIM - Zsh IMproved
- pkgver = r317.95f1e3c
+ pkgver = r343.01e2766
pkgrel = 1
url = https://github.com/Eriner/zim
install = zim.install
@@ -18,8 +18,10 @@ pkgbase = zsh-zim-git
backup = etc/zsh/zshrc
source = git://github.com/Eriner/zim.git
source = zim.install
- sha256sums = SKIP
- sha256sums = 9029f2f61ad96e0556a5b82f0b5b75863b495db0e00afb3ed37d81b4ba7ee1b5
+ source = zshrc
+ sha384sums = SKIP
+ sha384sums = f83543b7749334a6085701135eb330f099ed2e6236f9b694defaf519193109866e20de55d78bc25aa31a69924a1be7fb
+ sha384sums = 9f85ac47436359f437202d561c2b8bcf5d8e13c544380130729a6e3340d01bdd2d63d44d676b4e48125341076c17e891
pkgname = zsh-zim-git
diff --git a/PKGBUILD b/PKGBUILD
index 26a9928f6731..3b73c41695a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Contributor: Tatsuyuki Ishi <ishitatsuyuki at gmail dot com>
pkgrel=1
-pkgver=r317.95f1e3c
+pkgver=r343.01e2766
pkgname=zsh-zim-git
pkgdesc="ZIM - Zsh IMproved"
url="https://github.com/Eriner/zim"
@@ -10,11 +10,12 @@ license=('MIT')
depends=('zsh')
makedepends=('git' 'rsync')
optdepends=('otf-powerline-symbols-git: for eriner prompt')
-source=('git://github.com/Eriner/zim.git' 'zim.install')
+source=('git://github.com/Eriner/zim.git' 'zim.install' 'zshrc')
options=('!strip')
install='zim.install'
-sha256sums=('SKIP'
- '9029f2f61ad96e0556a5b82f0b5b75863b495db0e00afb3ed37d81b4ba7ee1b5')
+sha384sums=('SKIP'
+ 'f83543b7749334a6085701135eb330f099ed2e6236f9b694defaf519193109866e20de55d78bc25aa31a69924a1be7fb'
+ '9f85ac47436359f437202d561c2b8bcf5d8e13c544380130729a6e3340d01bdd2d63d44d676b4e48125341076c17e891')
_gitname='zim'
backup=('etc/zsh/zlogin' 'etc/zsh/zimrc' 'etc/zsh/zshrc')
@@ -31,18 +32,14 @@ build() {
rm -f $srcdir/etc/zsh/*
- echo "source /etc/zsh/zimrc" > "$srcdir/etc/zsh/zshrc"
- echo "source /usr/lib/zim/init.zsh" >> "$srcdir/etc/zsh/zshrc"
-
- sed -i 's#\${ZDOTDIR:-\${HOME}}/\.zim\(\>\)#/usr/lib/zim\1#g' $(find $srcdir/$_gitname -name init.zsh) $srcdir/$_gitname/templates/zlogin
- sed -i 's#\${ZDOTDIR:-\${HOME}}/\.zim#/usr/lib/zim#g' $srcdir/$_gitname/modules/debug/functions/trace-zim
-
for entry in ${backup[@]}; do
rcfile=$(basename $entry)
if [ -f $srcdir/$_gitname/templates/$rcfile ]; then
echo "source /usr/lib/zim/templates/$rcfile" >> "$srcdir/etc/zsh/$rcfile"
fi
- done
+ done
+
+ cp $srcdir/zshrc $srcdir/etc/zsh/zshrc
}
package() {
diff --git a/zshrc b/zshrc
new file mode 100644
index 000000000000..ac22062edddf
--- /dev/null
+++ b/zshrc
@@ -0,0 +1,14 @@
+
+
+#
+# User configuration sourced by interactive shells
+#
+
+# Change default zim location
+export ZIM_HOME=/usr/lib/zim
+
+# Source zim
+if [[ -s ${ZIM_HOME}/init.zsh ]]; then
+ source ${ZIM_HOME}/init.zsh
+fi
+