fix the 'Help' menu items

3 files changed, 16 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 92fd47bb0301..1103de073b99 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 = 9
+	pkgrel = 10
 	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 = 066aa536497ba582b5222548c982477ef894ce9ddc46db52b3a63971a67b40c5
+	sha256sums = 74e216ae7034236520c5c16addb4371dccb0dbea573cf0d735348765346ccfb1
 
 pkgname = lbe
diff --git a/PKGBUILD b/PKGBUILD
index ce1af8760f72..74db03c548ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname='lbe'
 pkgver=2.8.2
-pkgrel=9
+pkgrel=10
 pkgdesc="Jarek Gawor's LDAP Browser/Editor (last freeware version)"
 arch=('any')
 #url="http://www.openchannelsoftware.com/projects/LDAP_Browser_Editor"
@@ -14,18 +14,23 @@ source=("https://nullroute.lt/mirrors/files/ldapbrowser-$pkgver.zip"
         "lbe.sh")
 sha256sums=('6c1a1b80b81d83f005d4a006bc070b1b8f44f90151f7af6b14004c96e26687ec'
             'ccdc18f2879c6ab10aa0f3ad087a3aa225a6146340be7e2fb46302b961255972'
-            '066aa536497ba582b5222548c982477ef894ce9ddc46db52b3a63971a67b40c5')
+            '74e216ae7034236520c5c16addb4371dccb0dbea573cf0d735348765346ccfb1')
 
 package() {
   # Java program files
   mkdir -p "$pkgdir"/usr/lib/lbe
-  cp -av lbe.jar lib "$pkgdir"/usr/lib/lbe/
+  cp -av lbe.jar lib                  "$pkgdir"/usr/lib/lbe/
+
+  # Docs
+  mkdir -p "$pkgdir"/usr/share/doc/lbe
+  cp -av *.html help CHANGES.TXT      "$pkgdir"/usr/share/doc/lbe/
 
   # Initial config directory
   mkdir -p "$pkgdir"/usr/share/lbe/skel
-  cp -av attributes.config templates "$pkgdir"/usr/share/lbe/skel/
-  cp -av help/uofmichigan.cfg.sample "$pkgdir"/usr/share/lbe/skel/'U of Michigan'.cfg
-  ln -s /etc/ssl/certs/java/cacerts "$pkgdir"/usr/share/lbe/skel/lbecacerts
+  cp -av attributes.config templates  "$pkgdir"/usr/share/lbe/skel/
+  cp -av help/uofmichigan.cfg.sample  "$pkgdir"/usr/share/lbe/skel/'U of Michigan'.cfg
+  ln -s /usr/share/doc/lbe/help       "$pkgdir"/usr/share/lbe/skel/help
+  ln -s /etc/ssl/certs/java/cacerts   "$pkgdir"/usr/share/lbe/skel/lbecacerts
   {
     echo
     echo "# Added by packager"
@@ -33,10 +38,6 @@ package() {
     echo "krbprincipalkey=binary"
   } >> "$pkgdir"/usr/share/lbe/skel/attributes.config
 
-  # 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/
diff --git a/lbe.sh b/lbe.sh
index e9ff8bd9ab7a..336ddaf158e9 100755
--- a/lbe.sh
+++ b/lbe.sh
@@ -14,6 +14,9 @@ if [ ! -d "$confdir" ]; then
 	mkdir -p -m 0700 "$confdir"
 	cp -a /usr/share/lbe/skel/. "$confdir"/
 fi
+if [ ! -e "$confdir"/help ]; then
+	ln -nsf /usr/share/doc/lbe/help "$confdir"/help
+fi
 cd "$confdir"
 
 # Protect session configuration files.