[med-svn] r17721 - trunk/packages/arb/trunk/debian/bin

[Elmar Pruesse]

Author: epruesse-guest
Date: 2014-08-13 14:26:19 +0000 (Wed, 13 Aug 2014)
New Revision: 17721

Modified:
   trunk/packages/arb/trunk/debian/bin/arb
Log:
update wrapper script for arb 6.0
 - pass arguments to arb
 - do not link import/export format definitions (ARB 6 scans both global 
   and user directories now)
 - only but demo.arb into $ARBUSERDATA directory if it has just been 
   created


Modified: trunk/packages/arb/trunk/debian/bin/arb
===================================================================
--- trunk/packages/arb/trunk/debian/bin/arb	2014-08-13 13:43:59 UTC (rev 17720)
+++ trunk/packages/arb/trunk/debian/bin/arb	2014-08-13 14:26:19 UTC (rev 17721)
@@ -1,7 +1,6 @@
 #!/bin/sh
 CONF=/etc/arb/arb.conf
 USERCONF=${HOME}/.arb.conf
-USERPROP=${HOME}/.arb_prop
 
 [ -s $CONF ]     && . $CONF
 # override general settings with user specific settings
@@ -9,30 +8,21 @@
 
 # Try to make user working directory for arb data
 if [ _"$ARBUSERDATA" != _"" ] ; then
-    if [ ! -d $ARBUSERDATA ] ; then
-	mkdir -p $ARBUSERDATA || ARBUSERDATA=""
+    if [ ! -d "$ARBUSERDATA" ] ; then
+	if "mkdir -p $ARBUSERDATA"; then
+	    if [ -s /usr/share/doc/arb/examples/demo.arb.gz ] ; then
+                cp -a /usr/share/doc/arb/examples/demo.arb.gz .
+                gunzip demo.arb.gz
+             fi
+	else
+	  ARBUSERDATA=""
+	fi
     fi
 fi
 if [ _"$ARBUSERDATA" != _"" ] ; then
     cd $ARBUSERDATA
-    if [ ! -s demo.arb ] ; then
-	if [ -s /usr/share/doc/arb/examples/demo.arb.gz ] ; then
-	    cp -a /usr/share/doc/arb/examples/demo.arb.gz .
-	    gunzip demo.arb.gz
-	fi
-    fi
 fi
 
-# if user has no arb input masks just symlink to the sample masks
-[ -d "$USERPROP/inputMasks" ] || mkdir -p "$USERPROP/inputMasks"
-MASKS=`ls "$USERPROP/inputMasks" | wc -l`
-if [ $MASKS -eq 0 ] ; then
-    cd "$USERPROP/inputMasks"
-    for mask in `ls /usr/lib/arb/lib/inputMasks/*.mask` ; do
-	ln -s $mask .
-    done
-fi
-
 # Save files as group readable
 umask 002
 
@@ -52,5 +42,6 @@
 EOF
 fi
 
+export ARB_PROP ARB_LOCAL_PTS ARB_XTERM ARB_TEXTEDIT
 export ARBHOME=/usr/lib/arb
-${ARBHOME}/bin/arb
+exec ${ARBHOME}/bin/arb "$@"