X-Original-To: alpine-devel@lists.alpinelinux.org
Delivered-To: alpine-devel@mail.alpinelinux.org
Received: from mail-pa0-f52.google.com (mail-pa0-f52.google.com [209.85.220.52])
	(using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
	(No client certificate requested)
	by mail.alpinelinux.org (Postfix) with ESMTPS id 43D6FDC0186
	for <alpine-devel@lists.alpinelinux.org>; Wed, 23 Jul 2014 13:06:31 +0000 (UTC)
Received: by mail-pa0-f52.google.com with SMTP id bj1so1677312pad.25
        for <alpine-devel@lists.alpinelinux.org>; Wed, 23 Jul 2014 06:06:31 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=from:to:cc:subject:date:message-id;
        bh=/m2uDh0n9ujFRkcLML+orQ+aZIs3/+khjfwQfuIrqZc=;
        b=LFN21blxvJ2BNvw7ZkncoO1+LMvKC4vMC5X+udwG45A+t5X4WQUcPWC5wtcbfirNKq
         SJtW0YXRJDi3KiUYkxULBXYn1fzGtb9HZZlABJ9R/JFK23BQyUw0o2r4xzg6FfNRLZBh
         oU1HVu1wqPTF309tLj6IwdcSy77xN7rYysIkon8im2NcY1YOySydZRR98o90Np3PkzJn
         +8zWDVNZOBU3n8QB1zCvgKAFCuWB40ZGN0E4yXuApxQ9rXL6E8n6tOOz8QB8t69qjvbA
         CUrwK/6KPI/OUVyNrjrInkrNTBReSf+6O+GuWr/8esn8DcXDdtRIULv838mJ9q8i3oMm
         gBcA==
X-Received: by 10.70.87.177 with SMTP id az17mr1557221pdb.114.1406120790131;
        Wed, 23 Jul 2014 06:06:30 -0700 (PDT)
Received: from localhost.localdomain ([50.0.224.39])
        by mx.google.com with ESMTPSA id fq4sm3113987pdb.71.2014.07.23.06.06.02
        for <multiple recipients>
        (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
        Wed, 23 Jul 2014 06:06:03 -0700 (PDT)
From: Isaac Dunham <ibid.ag@gmail.com>
To: alpine-devel@lists.alpinelinux.org
Cc: Isaac Dunham <ibid.ag@gmail.com>
Subject: [alpine-devel] [PATCH] testing/sword: add sword group for installing modules systemwide.
Date: Wed, 23 Jul 2014 06:05:54 -0700
Message-Id: <1406120754-21228-1-git-send-email-ibid.ag@gmail.com>
X-Mailer: git-send-email 2.0.2
X-Mailinglist: alpine-devel
Precedence: list
List-Id: Alpine Development <alpine-devel.lists.alpinelinux.org>
List-Unsubscribe: 
	<mailto:alpine-devel+unsubscribe@lists.alpinelinux.org?subject=unsubscribe>
List-Post: <mailto:alpine-devel@lists.alpinelinux.org>
List-Help: <mailto:alpine-devel+help@lists.alpinelinux.org?subject=help>
List-Subscribe: 
	<mailto:alpine-devel+subscribe@lists.alpinelinux.org?subject=subscribe>

installmgr was trying to install into /usr/share/sword without permissions,
resulting in great confusion.
This change lets all members of the 'sword' group install modules systemwide.
---
 testing/sword/APKBUILD          | 11 +++++++++--
 testing/sword/sword.pre-install |  3 +++
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100755 testing/sword/sword.pre-install

diff --git a/testing/sword/APKBUILD b/testing/sword/APKBUILD
index 468fae2..10611e6 100644
--- a/testing/sword/APKBUILD
+++ b/testing/sword/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Isaac Dunham <ibid.ag@gmail.com>
 pkgname=sword
 pkgver=1.7.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Library for free Bible software"
 url="http://www.crosswire.org/sword/"
 arch="all"
@@ -18,7 +18,8 @@ depends=""
 # curl-dev is needed for standard packages.
 depends_dev="zlib-dev icu-dev curl-dev clucene-dev"
 makedepends="$depends_dev"
-install=""
+pkggroups="sword"
+install="$pkgname.pre-install"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-utils"
 source="http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/sword-$pkgver.tar.gz
 	00-fflush.patch
@@ -55,6 +56,12 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
+	mkdir -p -m775 "$pkgdir/var/lib/sword/modules"  && \
+	mv "$pkgdir/usr/share/sword/mods.d" "$pkgdir/var/lib/sword/" && \
+	chown root:sword "$pkgdir"/var/lib/sword/mod*		&& \
+	chmod -R 0775 "$pkgdir/var/lib/sword/mods.d"  	&& \
+	sed -e 's|\(DataPath=\).*|\1/var/lib/sword/|g' 	   \
+	-i "$pkgdir/etc/sword.conf" || return 1
 	rm -f "$pkgdir"/usr/lib/*.la
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 	for i in INSTALL README ChangeLog; do
diff --git a/testing/sword/sword.pre-install b/testing/sword/sword.pre-install
new file mode 100755
index 0000000..0ab0d71
--- /dev/null
+++ b/testing/sword/sword.pre-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "Adding 'sword' group for installing SWORD modules systemwide"
+addgroup sword 2>/dev/null >&2 || true
-- 
2.0.2



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---