X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=buildscripts%2Flilypond-profile.sh;h=16afdaba978ef86cbe19c9dedee0b80e26bd18fc;hb=1afd7832bd5915917755709627884db4cf600bb2;hp=ccfe245675bab41b9c749e0bc265459cb9091525;hpb=030669fe5c65fa743a14fa7cc0f795ee5ac14435;p=lilypond.git

diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh
index ccfe245675..16afdaba97 100644
--- a/buildscripts/lilypond-profile.sh
+++ b/buildscripts/lilypond-profile.sh
@@ -7,10 +7,19 @@
 # If run by hand or from you .profile, run as follows
 #   . /PATH/TO/lilypond-profile
 
+
+
 # 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.
@@ -18,17 +27,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
 
@@ -39,7 +48,7 @@ EXAMPLE 2: Local installation
 	* Logout.
 
 
-EXAMPLE 3: Global installation
+EXAMPLE 3: Install for all users.
 
 	* Do
 
@@ -47,17 +56,11 @@ EXAMPLE 3: Global installation
 
 	* 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'`
@@ -70,18 +73,22 @@ 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:=""}
-	## export GS_LIB
+	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
+	tmppfadir=`kpsewhich ecrm10.pfa`
+	GS_FONTPATH=$datadir/pfa:`dirname $tmppfadir`:${GS_FONTPATH:=""}
+	export GS_FONTPATH
 
-fi
+fi # remove for zsh