* scm/music-functions.scm (determine-split-list): bugfix: only use

[lilypond.git] / buildscripts / lilypond-profile.sh

diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh
index 44559f6e3ec272058b82c1a49c2b9943912932ab..d8ea2d3e6766d1b23a07de49c12397d6ee311f7f 100644 (file)
--- a/buildscripts/lilypond-profile.sh
+++ b/buildscripts/lilypond-profile.sh
@@ -7,11 +7,19 @@
 # If run by hand or from you .profile, run as follows
 #   . /PATH/TO/lilypond-profile
 
-echo $0
+
+
 # workaround for ZSH posix $0-problem
-[ -n "$ZSH_NAME" ] && setopt nofunctionargzero
 
-if [ `basename "$0"` = "lilypond-profile" ] ; then
+# for zsh: start removing here
+if [ -n "$ZSH_NAME" ] ; then
+    echo "You are running this script under zsh. Edit this script by hand. "
+    echo 
+    echo "(failed to source lilypond-profile)"
+    return 2
+fi
+
+if [ `basename "$0"` = "lilypond-profile" ] ; then 
     cat >/dev/stderr <<EOF
     
 Error: This script cannot be run in a subshell; it MUST be sourced.
@@ -19,7 +27,7 @@ Error: This script cannot be run in a subshell; it MUST be sourced.
 
 EXAMPLE 1: One time use 
 
-       Do
+       * Do
 
            . $0
 
@@ -48,17 +56,11 @@ EXAMPLE 3: Install for all users.
 
        * Logout
 
-
-
 EOF
 
-
-## If the message above is printed erroneously,
-## the following commands  kills the current terminal/shell.
-## hence the ZSH  test above.
-
-    exit 2 
+    return 2
 else
+#  for zsh: till here
 
        if [ -z "$LILYPONDPREFIX" ]; then
            datadir=`echo "@local_lilypond_datadir@" | sed 's!//!/!g'`
@@ -71,8 +73,11 @@ else
 
        # Add the installation directory to the teTeX system tree, 
        # see Documentation/misc/fontinstallation
-       TEXMF="{$datadir,"`kpsexpand  \\$TEXMF`"}"
-       export TEXMF
+       if [ -z `echo $TEXMF | grep "$datadir"` ]; then
+               TEXMF="{$datadir,"`kpsexpand  \\$TEXMF`"}"
+               export TEXMF
+       fi
+
 
        # For direct ps output: ps/lilyponddefs.ps
        ## GS_LIB="$datadir/ps:"${GS_LIB:=""}
@@ -82,7 +87,7 @@ else
        ## GS_FONTPATH=`kpsewhich -expand-path=\\$T1FONTS`:${GS_FONTPATH:=""}
        ## export GS_FONTPATH
 
-fi
+fi # remove for zsh