diff options
| author | Tatsuyuki Ishi | 2017-10-22 13:14:05 +0900 |
|---|---|---|
| committer | Tatsuyuki Ishi | 2017-10-22 13:14:05 +0900 |
| commit | 37825d889b26ff873be708290e0e38fb70312e78 (patch) | |
| tree | bafb77dd8eecebe861b928874bce3cfd1e02a340 | |
| parent | 48cc17e3e885b197e8f1ee050391ebe694a490e8 (diff) | |
| download | aur-37825d889b26ff873be708290e0e38fb70312e78.tar.gz | |
Make the script more robust
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 26 | ||||
| -rw-r--r-- | zim.install | 2 |
3 files changed, 14 insertions, 20 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sun Oct 22 01:40:45 UTC 2017 +# Sun Oct 22 04:12:57 UTC 2017 pkgbase = zsh-zim-git pkgdesc = ZIM - Zsh IMproved pkgver = r343.01e2766 - pkgrel = 2 + pkgrel = 3 url = https://github.com/Eriner/zim install = zim.install arch = any @@ -20,7 +20,7 @@ pkgbase = zsh-zim-git source = zim.install source = zshrc sha384sums = SKIP - sha384sums = f83543b7749334a6085701135eb330f099ed2e6236f9b694defaf519193109866e20de55d78bc25aa31a69924a1be7fb + sha384sums = ba9906f5cad124b1a419008ff5f98ca31414056be7a89d94ecf679a170765208d244b2d41ce85a2dba6a5aa60fc7f299 sha384sums = f9369671dd4b4e116a6b1d6769482f148dc062ec9ff1cb0ec70f0c0ee91a62efc9acdae0193a299fab941e770f377d74 pkgname = zsh-zim-git @@ -1,6 +1,6 @@ # Contributor: Tatsuyuki Ishi <ishitatsuyuki at gmail dot com> -pkgrel=2 +pkgrel=3 pkgver=r343.01e2766 pkgname=zsh-zim-git pkgdesc="ZIM - Zsh IMproved" @@ -14,7 +14,7 @@ source=('git://github.com/Eriner/zim.git' 'zim.install' 'zshrc') options=('!strip') install='zim.install' sha384sums=('SKIP' - 'f83543b7749334a6085701135eb330f099ed2e6236f9b694defaf519193109866e20de55d78bc25aa31a69924a1be7fb' + 'ba9906f5cad124b1a419008ff5f98ca31414056be7a89d94ecf679a170765208d244b2d41ce85a2dba6a5aa60fc7f299' 'f9369671dd4b4e116a6b1d6769482f148dc062ec9ff1cb0ec70f0c0ee91a62efc9acdae0193a299fab941e770f377d74') _gitname='zim' backup=('etc/zsh/zlogin' 'etc/zsh/zimrc' 'etc/zsh/zshrc') @@ -24,28 +24,22 @@ pkgver() { printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } -build() { +prepare() { cd $srcdir/$_gitname git submodule update --init --recursive +} - mkdir -p $srcdir/etc/zsh +package() { + mkdir -p $pkgdir/usr/lib/zim + rsync -ar --exclude=".git*" $srcdir/$_gitname/ $pkgdir/usr/lib/zim + cp $srcdir/zshrc $pkgdir/usr/lib/zim/templates/zshrc - rm -f $srcdir/etc/zsh/* + mkdir -p $pkgdir/etc/zsh 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" + echo "source /usr/lib/zim/templates/$rcfile" >> "$pkgdir/etc/zsh/$rcfile" fi done - - cp $srcdir/zshrc $srcdir/etc/zsh/zshrc -} - -package() { - mkdir -p $pkgdir/usr/lib/zim - rsync -ar --exclude=".git*" $srcdir/$_gitname/ $pkgdir/usr/lib/zim - - mkdir -p $pkgdir/etc - cp -r $srcdir/etc/zsh $pkgdir/etc } diff --git a/zim.install b/zim.install index 22238b1f5d59..0e04de43a0eb 100644 --- a/zim.install +++ b/zim.install @@ -20,7 +20,7 @@ post_remove() { } compile_scripts() { - zsh -c 'source /etc/zsh/zshrc; source /usr/lib/zim/templates/zlogin;' + zsh -c 'source /usr/lib/zim/templates/zshrc; source /usr/lib/zim/templates/zlogin;' } remove_compiled_scripts() { |