(postscript->png): space before

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

diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh
index 8c5d04224f85233aef4a3080693134881e237e28..da3e1dc1539e70451008e82d28549892d7008da9 100644 (file)
--- a/buildscripts/lilypond-profile.sh
+++ b/buildscripts/lilypond-profile.sh
@@ -7,7 +7,22 @@
 # If run by hand or from you .profile, run as follows
 #   . /PATH/TO/lilypond-profile
 
-if [ `basename "$0"` = "lilypond-profile" ] ; then
+
+
+
+
+# In ZSH, $0 is set to the script name, regardless of whether sourced
+# or run in a subshell.
+if [ -n "$ZSH_NAME" ] ; then
+    echo "Make sure that this script is sourced, ie. run as "
+    echo 
+    echo "   . lilypond-profile"
+    echo ""
+    echo "Continuing anyway ..."
+    return 2
+fi
+
+if [ -z "$ZSH_NAME" -a `basename "$0"` = "lilypond-profile" ] ; then 
     cat >/dev/stderr <<EOF
     
 Error: This script cannot be run in a subshell; it MUST be sourced.
@@ -15,17 +30,17 @@ Error: This script cannot be run in a subshell; it MUST be sourced.
 
 EXAMPLE 1: One time use 
 
-       Do
+       * Do
 
            . $0
 
 
 
-EXAMPLE 2: Local installation
+EXAMPLE 2: Install for self
 
        * Do
 
-           mv lilypond-profile $HOME/bin/
+           cp lilypond-profile $HOME/bin/
 
        * Add
 
@@ -36,7 +51,7 @@ EXAMPLE 2: Local installation
        * Logout.
 
 
-EXAMPLE 3: Global installation
+EXAMPLE 3: Install for all users.
 
        * Do
 
@@ -44,34 +59,26 @@ EXAMPLE 3: Global installation
 
        * Logout
 
-
-
 EOF
-    exit 2 
-fi
 
-if [ -z "$LILYPONDPREFIX" ]; then
-    datadir=`echo "@local_lilypond_datadir@" | sed 's!//!/!g'`
+    return 2
 else
-    if [ -d "$LILYPONDPREFIX/share" ]; then
-       datadir=$LILYPONDPREFIX/share/lilypond/
-    fi
-    echo "Setting tree to $datadir"
+       if [ -z "$LILYPONDPREFIX" ]; then
+           datadir=`echo "@local_lilypond_datadir@" | sed 's!//!/!g'`
+       else
+           if [ -d "$LILYPONDPREFIX/share" ]; then
+               datadir=$LILYPONDPREFIX/share/lilypond/
+           fi
+           echo "Setting tree to $datadir"
+       fi
+
+       # Add the installation directory to the teTeX system tree, 
+       # see Documentation/misc/fontinstallation
+       if [ -z `echo $TEXMF | grep "$datadir"` ]; then
+               TEXMF="{$datadir,"`kpsexpand  \\$TEXMF`"}"
+               export TEXMF
+       fi
 fi
-
-# Add the installation directory to the teTeX system tree, 
-# see Documentation/misc/fontinstallation
-TEXMF="{$datadir,"`kpsexpand  \\$TEXMF`"}"
-export TEXMF
-
-# For direct ps output: ps/lilyponddefs.ps
-## GS_LIB="$datadir/ps:"${GS_LIB:=""}
-## export GS_LIB
-
-# For direct ps output fonts. Add all available TeX Type1 fonts
-## GS_FONTPATH=`kpsewhich -expand-path=\\$T1FONTS`:${GS_FONTPATH:=""}
-## export GS_FONTPATH
-