X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Flilypond-invoke-editor.scm;h=7ff21871fe4ac444e7a07c6f984fca5992344f66;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=048ac3f53b3021fa005478e3ace188f1e3fd02f4;hpb=45e73c21395bfa26f928c216fc6ee72fc9fa68d9;p=lilypond.git

diff --git a/scripts/lilypond-invoke-editor.scm b/scripts/lilypond-invoke-editor.scm
old mode 100755
new mode 100644
index 048ac3f53b..7ff21871fe
--- a/scripts/lilypond-invoke-editor.scm
+++ b/scripts/lilypond-invoke-editor.scm
@@ -4,7 +4,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2005--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2005--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;; gui debug helper
 ;; (define (exit x) (system "sleep 10"))
@@ -12,6 +12,7 @@
 (use-modules
  (ice-9 getopt-long)
  (ice-9 regex)
+ (srfi srfi-1)
  (srfi srfi-13)
  (srfi srfi-14))
 
@@ -23,10 +24,9 @@
 
 ;; argv0 relocation -- do in wrapper?
 
-
-(define LILYPONDPREFIX
+(define LILYPOND_DATADIR
   (let* ((prefix
-	  (or (getenv "LILYPONDPREFIX")
+	  (or (getenv "LILYPOND_DATADIR")
 	      (dirname  (dirname (car (command-line)))))))
     
 
@@ -42,7 +42,7 @@
     (define-public (_ x) x))
 
 (define (show-version port)
-  (format port "~a (GNU LilyPond) ~a \n" PROGRAM-NAME TOPLEVEL-VERSION))
+  (format port "~a (GNU LilyPond) ~a\n" PROGRAM-NAME TOPLEVEL-VERSION))
 
 (define (show-help port)
   (format port (_ "Usage: lilypond-invoke-editor [textedit://]FILE:LINE:CHAR:COLUMN
@@ -124,6 +124,20 @@ Options:
        (format "~a ~a" (getenv "BROWSER") uri)
        (format #f "firefox -remote 'OpenURL(~a,new-tab)'" uri))))
 
+
+(define (strip-framework-path var)
+  (define pat "lilypond/usr")
+  (if (getenv var)
+      (let*
+	  ((val (getenv var))
+	   (paths (string-split val #\:))
+	   (without (remove (lambda (s) (string-contains s pat))
+			    paths)))
+	
+	(if (not (= (length without)
+		    (length paths)))
+	    (setenv var (string-join without ":"))))))
+
 (define (main args)
   (let ((files (parse-options args)))
     (if (running-from-gui?)
@@ -137,9 +151,11 @@ Options:
 	(begin
 	  (show-help (current-error-port))
 	  (exit 2)))
-    (set! %load-path (cons LILYPONDPREFIX %load-path))
+    (set! %load-path (cons LILYPOND_DATADIR %load-path))
+
     (primitive-eval '(use-modules (scm editor)))
 
+    (strip-framework-path "LD_LIBRARY_PATH")
     (let* ((uri (car files)))
       (if (is-textedit-uri? uri)
 	  (run-editor uri)