split template configurations into /usr/share

3 files changed, 42 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index da84ec330e99..1e9df3df7031 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lbe
 	pkgdesc = Jarek Gawor's LDAP Browser/Editor (last freeware version)
 	pkgver = 2.8.2
-	pkgrel = 6
+	pkgrel = 7
 	url = http://web.archive.org/web/20090201080715/http://mcs.anl.gov/~gawor/ldap/
 	arch = any
 	license = custom
@@ -12,6 +12,6 @@ pkgbase = lbe
 	source = lbe.sh
 	sha256sums = 6c1a1b80b81d83f005d4a006bc070b1b8f44f90151f7af6b14004c96e26687ec
 	sha256sums = ccdc18f2879c6ab10aa0f3ad087a3aa225a6146340be7e2fb46302b961255972
-	sha256sums = a7a2010364196bae2fcd0db00e374a289ea9b0eee4d64f5dac9f88520aacd967
+	sha256sums = b2af92e7329c26673582d2df55ebbaa0dbc86a41c4080b5222a8b1d6ad607057
 
 pkgname = lbe
diff --git a/PKGBUILD b/PKGBUILD
index 500d8291bb43..9f3e26f5fde9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname='lbe'
 pkgver=2.8.2
-pkgrel=6
+pkgrel=7
 pkgdesc="Jarek Gawor's LDAP Browser/Editor (last freeware version)"
 arch=('any')
 #url="http://www.openchannelsoftware.com/projects/LDAP_Browser_Editor"
@@ -15,7 +15,7 @@ source=("https://nullroute.lt/mirrors/files/ldapbrowser-$pkgver.zip"
 noextract=("ldapbrowser-$pkgver.zip")
 sha256sums=('6c1a1b80b81d83f005d4a006bc070b1b8f44f90151f7af6b14004c96e26687ec'
             'ccdc18f2879c6ab10aa0f3ad087a3aa225a6146340be7e2fb46302b961255972'
-            'a7a2010364196bae2fcd0db00e374a289ea9b0eee4d64f5dac9f88520aacd967')
+            'b2af92e7329c26673582d2df55ebbaa0dbc86a41c4080b5222a8b1d6ad607057')
 
 prepare() {
   # Extract the archive manually into a subfolder
@@ -24,18 +24,34 @@ prepare() {
 }
 
 package() {
-  mkdir -p "$pkgdir/usr/lib"
-  cp -a "$srcdir/ldapbrowser-$pkgver" "$pkgdir/usr/lib/lbe"
+  cd "ldapbrowser-$pkgver"
+
+  # Java program files
+  mkdir -p "$pkgdir"/usr/lib/lbe
+  cp -av lbe.jar lib "$pkgdir"/usr/lib/lbe/
+
+  # Initial config directory
+  mkdir -p "$pkgdir"/usr/share/lbe/skel
+  cp -av attributes.config lbecacerts templates "$pkgdir"/usr/share/lbe/skel/
+  cp -av help/uofmichigan.cfg.sample "$pkgdir"/usr/share/lbe/skel/'U of Michigan'.cfg
+
+  # Docs
+  mkdir -p "$pkgdir"/usr/share/doc/lbe
+  cp -av *.html help CHANGES.TXT "$pkgdir"/usr/share/doc/lbe/
+
+  # Licenses
+  mkdir -p "$pkgdir"/usr/share/licenses/lbe
+  cp -av LICENSE.ICONS "$pkgdir"/usr/share/licenses/lbe/
 
   {
     echo
     echo "# added by packager"
     echo "krbextradata=binary"
     echo "krbprincipalkey=binary"
-  } >> "$pkgdir/usr/lib/lbe/attributes.config"
+  } >> "$pkgdir"/usr/lib/lbe/attributes.config
 
-  install -Dm755 "$srcdir/lbe.desktop"   "$pkgdir/usr/share/applications/lbe.desktop"
-  install -Dm755 "$srcdir/lbe.sh"        "$pkgdir/usr/bin/lbe"
+  install -Dm755 "$srcdir/lbe.desktop"   "$pkgdir"/usr/share/applications/lbe.desktop
+  install -Dm755 "$srcdir/lbe.sh"        "$pkgdir"/usr/bin/lbe
 }
 
 # vim: ts=2:sw=2:et
diff --git a/lbe.sh b/lbe.sh
index d7c0abc3f271..5966d94b66f4 100755
--- a/lbe.sh
+++ b/lbe.sh
@@ -1,36 +1,36 @@
 #!/bin/sh -e
 
-: ${XDG_CONFIG_HOME:=~/.config}
+appdir=/usr/lib/lbe
+datadir=/usr/share/lbe
 
-appdir="/usr/lib/lbe"
-
-if [ -d "$HOME/.lbe" ]; then
-	confdir="$HOME/.lbe"
+if [ -d ~/.lbe ]; then
+	confdir=~/.lbe
 else
-	confdir="$XDG_CONFIG_HOME/lbe"
+	confdir=${XDG_CONFIG_HOME:-~/.config}/lbe
 fi
 
+# LBE tries to find everything in the current working directory (it pretty much
+# expects the user to double-click lbe.jar in their ~/Downloads/lbe), so for a
+# system-wide /usr installation we must manually set up a config directory and
+# chdir() into it.
+
 if [ ! -d "$confdir" ]; then
-	mkdir -pm0700 "$confdir"
+	mkdir -p -m 0700 "$confdir"
+	cp -a "$datadir"/skel/. "$confdir"/
+
+	# XXX: we don't really need lbe.properties if we chdir anyway
 
 	cat > "$confdir/lbe.properties" <<-EOF
 	base=$confdir/
 	session.dir=$confdir/
 	cacert.file=$confdir/lbecacerts
 	EOF
-
-	cp -a "$appdir/help/uofmichigan.cfg.sample" "$confdir/U of Michigan.cfg"
-
-	cp -a "$appdir/templates" "$confdir/"
-fi
-
-if [ ! -k "$appdir/attributes.config" ]; then
-	cp -a "$appdir/attributes.config" "$confdir/"
 fi
 
-cd "$confdir" # FIXME: if we do this, we can ditch lbe.properties; any disadvantages?
+# Protect session configs
+umask 077
 
-umask 077 # protect session files
+cd "$confdir"
 
 for jvm in /usr/lib/jvm/java-8-{openjdk,jre}; do
 	if [ -d "$jvm" ]; then