- hard-coded user install paths outlined in this FAQ entry. This makes it so

that Pd-extended will look in the user install paths regardless of the prefs:
http://puredata.info/docs/faq/how-do-i-install-externals-and-help-files-with-pd-extended

- fixed prefs generating script to make the windows files properly 

- removed new hard-coded paths from the default prefs files


svn path=/trunk/; revision=10991

1 files changed, 51 insertions, 52 deletions

diff --git a/scripts/generate-pd-settings-files.sh b/scripts/generate-pd-settings-files.sh
index e7a744ca..910f9522 100755
--- a/scripts/generate-pd-settings-files.sh
+++ b/scripts/generate-pd-settings-files.sh
@@ -1,20 +1,19 @@
 #!/bin/sh
 
+ECHO=/sw/bin/echo
 LIBS="libdir Gem cyclone zexy creb cxc iemlib list-abs mapping markex maxlib memento mjlib motex oscx pddp pdogg pixeltango pmpd rradical sigpack smlib toxy unauthorized vbap pan freeverb hcs jmmmp ext13 ggee iem_anything flib ekext flatspace pdp pidip"
 
-GNULINUX_FONTPATH="~/pd-externals /usr/local/lib/pd-externals /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
-MACOSX_FONTPATH="~/Library/Pd /Library/Pd /System/Library/Fonts /Library/Fonts ~/Library/Fonts /usr/X11R6/lib/X11/fonts/TTF /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts /sw/lib/X11/fonts/msttf /sw/lib/X11/fonts/intl/TrueType /sw/lib/X11/fonts/applettf"
+GNULINUX_FONTPATH="/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
+MACOSX_FONTPATH="/System/Library/Fonts /Library/Fonts ~/Library/Fonts /usr/X11R6/lib/X11/fonts/TTF /System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home/lib/fonts"
 # these are set as hex(2) since the .reg format doesn't support REG_EXPAND_SZ.
 # Inno Setup doesn't convert REG_SZ hex values to REG_EXPAND_SZ, so Pd can't
 # read the values then.  Therefore there is a separate set for InnoSetup to
 # use to create REG_EXPAND_SZ VALUES
-# path1 = %USERPROFILE%/Application Data/Pd
-# path2 = %ProgramFiles%/Common Files/Pd
-# path3 = %SystemRoot%/Fonts
-WINDOWS_INNO_PATH="%USERPROFILE%/Application Data/Pd;%ProgramFiles%/Common Files/Pd;%SystemRoot%/Fonts"
-WINDOWS_REG_PATH="hex(2):25,00,50,00,72,00,6f,00,67,00,72,00,61,00,6d,00,46,00,69,00,6c,00,65,00,73,00,25,00,2f,00,43,00,6f,00,6d,00,6d,00,6f,00,6e,00,20,00,46,00,69,00,6c,00,65,00,73,00,2f,00,50,00,64,00,00,00 hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,4c,00,45,00,25,00,2f,00,41,00,70,00,70,00,6c,00,69,00,63,00,61,00,74,00,69,00,6f,00,6e,00,20,00,44,00,61,00,74,00,61,00,2f,00,50,00,64,00,00,00 hex(2):25,00,53,00,79,00,73,00,74,00,65,00,6d,00,52,00,6f,00,6f,00,74,00,25,00,2f,00,46,00,6f,00,6e,00,74,00,73,00,00,00"
+# path1 = %SystemRoot%/Fonts
+WINDOWS_INNO_PATH="%SystemRoot%/Fonts"
+WINDOWS_REG_PATH="hex(2):25,00,53,00,79,00,73,00,74,00,65,00,6d,00,52,00,6f,00,6f,00,74,00,25,00,2f,00,46,00,6f,00,6e,00,74,00,73,00,00,00"
 
-SCRIPT_DIR=`echo $0 | sed 's|\(.*\)/.*$|\1|'`
+SCRIPT_DIR=`${ECHO} $0 | sed 's|\(.*\)/.*$|\1|'`
 ROOT_DIR=${SCRIPT_DIR}/../packages
 
 GNULINUX_FILE=${ROOT_DIR}/linux_make/default.pdsettings
@@ -23,7 +22,7 @@ WINDOWS_FILE=${ROOT_DIR}/win32_inno/pd-settings.reg
 WINDOWS_INNO_FILE=${ROOT_DIR}/win32_inno/pd-inno.iss.in
 WINDOWS_INNO_REG_FILE=${ROOT_DIR}/win32_inno/pd-inno.registry.reg
 
-GNULINUX_HEADER='standardpath: 1\nverbose: 0\ndefeatrt: 0\nflags: -helppath ~/pd -helppath /usr/share/pd'
+GNULINUX_HEADER='standardpath: 1\nverbose: 0\ndefeatrt: 0\nflags:'
 
 
 MACOSX_HEADER='<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n<plist version="1.0">\n<dict>\n\t<key>defeatrt</key>\n\t<string>0</string>\n\t<key>flags</key>\n\t<string>-helppath ~/Library/Pd -helppath /Library/Pd</string>'
@@ -41,7 +40,7 @@ WINDOWS_INNO_HEADER=''
 # GNU/Linux -------------------------------------------------------------------#
 print_gnulinux ()
 {
-	 echo "loadlib$1: $2" >> $GNULINUX_FILE
+	 ${ECHO} "loadlib$1: $2" >> $GNULINUX_FILE
 }
 
 print_gnulinux_fontpath ()
@@ -50,21 +49,21 @@ print_gnulinux_fontpath ()
 	 IFS=' '
 	 for fontpath in $GNULINUX_FONTPATH; do
 		  ((++i)) 
-		  echo "path${i}: ${fontpath}" >> $GNULINUX_FILE
+		  ${ECHO} "path${i}: ${fontpath}" >> $GNULINUX_FILE
 	 done
-	 echo "npath: ${i}" >> $GNULINUX_FILE
+	 ${ECHO} "npath: ${i}" >> $GNULINUX_FILE
 }
 
 print_gnulinux_nloadlib ()
 {
-	 echo "nloadlib: $1" >> $GNULINUX_FILE
+	 ${ECHO} "nloadlib: $1" >> $GNULINUX_FILE
 }
 
 # Mac OS X --------------------------------------------------------------------#
 print_macosx () 
 {
-	 echo -e "\t<key>loadlib$1</key>" >> $MACOSX_FILE
-	 echo -e "\t<string>$2</string>" >> $MACOSX_FILE
+	 ${ECHO} -e "\t<key>loadlib$1</key>" >> $MACOSX_FILE
+	 ${ECHO} -e "\t<string>$2</string>" >> $MACOSX_FILE
 }
 
 print_macosx_fontpath ()
@@ -73,36 +72,36 @@ print_macosx_fontpath ()
 	 IFS=' '
 	 for fontpath in $MACOSX_FONTPATH; do
 		  ((++i)) 
-		  echo -e "\t<key>path${i}</key>" >> $MACOSX_FILE
-		  echo -e "\t<string>${fontpath}</string>" >> $MACOSX_FILE
+		  ${ECHO} -e "\t<key>path${i}</key>" >> $MACOSX_FILE
+		  ${ECHO} -e "\t<string>${fontpath}</string>" >> $MACOSX_FILE
 	 done
-	 echo -e "\t<key>npath</key>" >> $MACOSX_FILE
-	 echo -e "\t<string>${i}</string>" >> $MACOSX_FILE
+	 ${ECHO} -e "\t<key>npath</key>" >> $MACOSX_FILE
+	 ${ECHO} -e "\t<string>${i}</string>" >> $MACOSX_FILE
 }
 
 print_macosx_nloadlib ()
 {
-	echo -e "\t<key>nloadlib</key>" >> $MACOSX_FILE
-	echo -e "\t<string>${1}</string>" >> $MACOSX_FILE
+	${ECHO} -e "\t<key>nloadlib</key>" >> $MACOSX_FILE
+	${ECHO} -e "\t<string>${1}</string>" >> $MACOSX_FILE
 }
 
 # Windows ---------------------------------------------------------------------#
 print_windows ()
 {
-	 echo "\"loadlib$1\"=\"$2\"" >> $WINDOWS_FILE
-	 echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib$1; ValueData: $2; Tasks: libs"  >> $WINDOWS_INNO_REG_FILE
+	 ${ECHO} "\"loadlib$1\"=\"$2\"" >> $WINDOWS_FILE
+	 ${ECHO} "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib$1; ValueData: $2; Tasks: libs"  >> $WINDOWS_INNO_REG_FILE
 }
 
 print_windows_delete ()
 {
-	echo "\"${1}${2}\"=-" >> $WINDOWS_FILE
-	echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: ${1}${2}; Flags: deletevalue; Tasks: libs"  >> $WINDOWS_INNO_REG_FILE
+	${ECHO} "\"${1}${2}\"=-" >> $WINDOWS_FILE
+	${ECHO} "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: ${1}${2}; Flags: deletevalue; Tasks: libs"  >> $WINDOWS_INNO_REG_FILE
 }
 
 print_windows_helppath ()
 {
-	echo "\"flags\"=\"-helppath %UserProfile%/applic~1/Pd -helppath %ProgramFiles%/common~1/pd\"" >> $WINDOWS_FILE
-	echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: flags; ValueData: -helppath %UserProfile%/applic~1/Pd -helppath %ProgramFiles%/common~1/pd; Tasks: libs; Flags: uninsdeletekey" >> $WINDOWS_INNO_REG_FILE
+	${ECHO} "\"flags\"=\"" >> $WINDOWS_FILE
+	${ECHO} "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: flags; ValueData: ""; Tasks: libs; Flags: uninsdeletekey" >> $WINDOWS_INNO_REG_FILE
 }
 
 print_windows_inno_path ()
@@ -111,14 +110,14 @@ print_windows_inno_path ()
 	IFS=';'
 	for fontpath in $WINDOWS_INNO_PATH; do
 		((++j)) 
-		echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: expandsz; ValueName: path${j}; ValueData: ${fontpath}; Tasks: libs; Flags: uninsdeletekey" >> $WINDOWS_INNO_REG_FILE
+		${ECHO} "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: expandsz; ValueName: path${j}; ValueData: ${fontpath}; Tasks: libs; Flags: uninsdeletekey" >> $WINDOWS_INNO_REG_FILE
 	done
-	echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: npath; ValueData: ${j}; Tasks: libs; Flags: uninsdeletekey" >> $WINDOWS_INNO_REG_FILE
+	${ECHO} "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: npath; ValueData: ${j}; Tasks: libs; Flags: uninsdeletekey" >> $WINDOWS_INNO_REG_FILE
 # print lines to delete existing path flags
-	echo "; delete all existing path flags" >> $WINDOWS_FILE
+	${ECHO} "; delete all existing path flags" >> $WINDOWS_FILE
 	while [ $j -lt 100 ]; do
 		((++j)) 
-		echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path${j}; Flags: deletevalue; Tasks: libs"  >> $WINDOWS_INNO_REG_FILE
+		${ECHO} "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path${j}; Flags: deletevalue; Tasks: libs"  >> $WINDOWS_INNO_REG_FILE
 	done
 }
 
@@ -128,45 +127,45 @@ print_windows_reg_path ()
 	IFS=' '
 	for fontpath in $WINDOWS_REG_PATH; do
 		((++j)) 
-		echo "\"path${j}\"=${fontpath}" >> $WINDOWS_FILE
+		${ECHO} "\"path${j}\"=${fontpath}" >> $WINDOWS_FILE
 	done
-	echo "\"npath\"=${j}" >> $WINDOWS_FILE
+	${ECHO} "\"npath\"=${j}" >> $WINDOWS_FILE
 # print lines to delete existing path flags
-	echo "; delete all existing path flags" >> $WINDOWS_FILE
+	${ECHO} "; delete all existing path flags" >> $WINDOWS_FILE
 	while [ $j -lt 100 ]; do
 		((++j)) 
-		echo "\"path${j}\"=-" >> $WINDOWS_FILE
+		${ECHO} "\"path${j}\"=-" >> $WINDOWS_FILE
 	done
 }
 
 print_windows_nloadlib ()
 {
-	 echo "\"nloadlib\"=${1}" >> $WINDOWS_FILE
-	 echo "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: nloadlib; ValueData: ${1}; Tasks: libs; Flags: uninsdeletekey" >> $WINDOWS_INNO_REG_FILE
+	 ${ECHO} "\"nloadlib\"=${1}" >> $WINDOWS_FILE
+	 ${ECHO} "Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: nloadlib; ValueData: ${1}; Tasks: libs; Flags: uninsdeletekey" >> $WINDOWS_INNO_REG_FILE
 }
 #==============================================================================#
 
-echo "Running for GNU/Linux and Darwin:"
-echo -e $GNULINUX_HEADER > $GNULINUX_FILE
-echo -e $MACOSX_HEADER > $MACOSX_FILE
+${ECHO} "Running for GNU/Linux and Darwin:"
+${ECHO} -e $GNULINUX_HEADER > $GNULINUX_FILE
+${ECHO} -e $MACOSX_HEADER > $MACOSX_FILE
 i=0
 IFS=' '
 for lib in $LIBS; do
 	 ((++i)) 
-	 echo -n "$lib "
+	 ${ECHO} -n "$lib "
 	 print_gnulinux $i $lib
 	 print_macosx $i $lib
 done
-echo " "
+${ECHO} " "
 
 print_gnulinux_nloadlib $i
 print_macosx_nloadlib $i
 
 # run separately so some libs can be excluded on Windows
-echo "Running for Windows:"
+${ECHO} "Running for Windows:"
 
-echo -e $WINDOWS_HEADER > $WINDOWS_FILE
-echo -e $WINDOWS_INNO_HEADER > $WINDOWS_INNO_REG_FILE
+${ECHO} -e $WINDOWS_HEADER > $WINDOWS_FILE
+${ECHO} -e $WINDOWS_INNO_HEADER > $WINDOWS_INNO_REG_FILE
 
 print_windows_helppath
 
@@ -174,20 +173,20 @@ i=0
 IFS=' '
 for lib in $LIBS; do
 	 case "$lib" in
-		  pdp) echo -n "(ignoring $lib on Windows) " ;;
-		  pidip) echo -n "(ignoring $lib on Windows) " ;;
+		  pdp) ${ECHO} -n "(ignoring $lib on Windows) " ;;
+		  pidip) ${ECHO} -n "(ignoring $lib on Windows) " ;;
 		  *)
-				echo -n "$lib "
+				${ECHO} -n "$lib "
 				((++i)) 
 				print_windows $i $lib
 				;;
 	 esac
 done
-echo " "
+${ECHO} " "
 print_windows_nloadlib $i
 
 # print lines to delete existing loadlib flags
-echo "; delete any previous loadlib flags" >> $WINDOWS_FILE
+${ECHO} "; delete any previous loadlib flags" >> $WINDOWS_FILE
 while [ $i -lt 100 ]; do
 	 ((++i)) 
 	 print_windows_delete loadlib $i
@@ -201,12 +200,12 @@ head -`grep -n "STARTHERE" $WINDOWS_INNO_FILE | cut -d ':' -f 1` $WINDOWS_INNO_F
 cat $WINDOWS_INNO_REG_FILE >> $TMPFILE
 FILE_LENGTH=`wc -l $WINDOWS_INNO_FILE | cut -d ' ' -f 1`
 END_LENGTH=`grep -n "ENDHERE" $WINDOWS_INNO_FILE | cut -d ':' -f 1`
-tail -`expr $FILE_LENGTH - $END_LENGTH` $WINDOWS_INNO_FILE >> $TMPFILE
+tail -`expr $FILE_LENGTH - $END_LENGTH + 1` $WINDOWS_INNO_FILE >> $TMPFILE
 mv -f -- $TMPFILE $WINDOWS_INNO_FILE
 
 # the .pd-settings file needs an end tag for the path statements
 print_gnulinux_fontpath
 
 print_macosx_fontpath
-echo -e $MACOSX_FOOTER >> $MACOSX_FILE
+${ECHO} -e $MACOSX_FOOTER >> $MACOSX_FILE