X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 88B4DDC012D for ; Sat, 8 Aug 2015 09:57:17 +0000 (UTC) Received: from lithium.8pit.net (lithium.8pit.net [141.101.32.65]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id C9988DC010C; Sat, 8 Aug 2015 09:57:16 +0000 (UTC) Received: from localhost (ip5f5ac94c.dynamic.kabel-deutschland.de [95.90.201.76]); by lithium.8pit.net (OpenSMTPD) with ESMTPSA id b73a6b38; TLS version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Sat, 8 Aug 2015 11:57:14 +0200 (CEST) From: =?UTF-8?q?S=C3=B6ren=20Tempel?= To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH] fish: add /usr/bin/fish to /etc/shells Date: Sat, 8 Aug 2015 11:57:09 +0200 Message-Id: <1439027829-23486-1-git-send-email-soeren+git@soeren-tempel.net> X-Mailer: git-send-email 2.5.0 X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- main/fish/APKBUILD | 15 ++++++--------- main/fish/fish.post-install | 3 +++ main/fish/fish.post-upgrade | 1 + main/fish/fish.pre-deinstall | 3 +++ 4 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 main/fish/fish.post-install create mode 120000 main/fish/fish.post-upgrade create mode 100644 main/fish/fish.pre-deinstall diff --git a/main/fish/APKBUILD b/main/fish/APKBUILD index 4d44133..bc5f8bb 100644 --- a/main/fish/APKBUILD +++ b/main/fish/APKBUILD @@ -2,29 +2,27 @@ # Maintainer: William Pitcock pkgname=fish pkgver=2.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="a modern interactive commandline shell" url="http://www.fishshell.com/" arch="all" - -# guessed from fish/fish.cpp *gag* -license="GPL" - +license="GPL2" depends="" depends_dev="ncurses-dev" makedepends="$depends_dev autoconf automake libtool" -install="" +install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall" subpackages="$pkgname-doc" source="http://fishshell.com/files/$pkgver/fish-$pkgver.tar.gz fish-safe-strerror.patch" _builddir="$srcdir"/fish-$pkgver prepare() { - local i cd "$_builddir" + + local i= for i in $source; do case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1 ;; esac done @@ -33,7 +31,6 @@ prepare() { build() { cd "$_builddir" - ./configure --prefix=/usr \ --sysconfdir=/etc || return 1 make || return 1 diff --git a/main/fish/fish.post-install b/main/fish/fish.post-install new file mode 100644 index 0000000..e725135 --- /dev/null +++ b/main/fish/fish.post-install @@ -0,0 +1,3 @@ +#!/bin/sh +add-shell '/usr/bin/fish' +exit 0 diff --git a/main/fish/fish.post-upgrade b/main/fish/fish.post-upgrade new file mode 120000 index 0000000..7fa98c8 --- /dev/null +++ b/main/fish/fish.post-upgrade @@ -0,0 +1 @@ +fish.post-install \ No newline at end of file diff --git a/main/fish/fish.pre-deinstall b/main/fish/fish.pre-deinstall new file mode 100644 index 0000000..5741123 --- /dev/null +++ b/main/fish/fish.pre-deinstall @@ -0,0 +1,3 @@ +#!/bin/sh +remove-shell '/usr/bin/fish' +exit 0 -- 2.5.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---