lilypond-invoke-editor should not be called twice (issue 363790043 by fedelogy@gmail.com)

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

lilypond-invoke-editor should not be called twice (issue 363790043 by fedelogy@gmail.com)

fedelogy
Reviewers: ,

Description:
lilypond-invoke-editor should not be called twice

LilyPond issue #5396:
https://sourceforge.net/p/testlilyissues/issues/5396/

Please review this at https://codereview.appspot.com/363790043/

Affected files (+1, -7 lines):
   M sourcefiles/lilypond-sharhead.sh


Index: sourcefiles/lilypond-sharhead.sh
diff --git a/sourcefiles/lilypond-sharhead.sh  
b/sourcefiles/lilypond-sharhead.sh
index  
a98885fb7fa772d7ca4a66d7baa4adbfe454fd4b..d3764d86d56dcf819031e456c7d7a572005a1213  
100644
--- a/sourcefiles/lilypond-sharhead.sh
+++ b/sourcefiles/lilypond-sharhead.sh
@@ -212,12 +212,6 @@ wrapscript="${bindir}/%(name)s-wrapper"
  for interp in python guile; do
      echo "Creating script $wrapscript.$interp"

-    if test "$interp" = "guile"; then
- callmain="-e main"
-    else
- callmain=""
-    fi
-
      rm -f "$wrapscript.$interp" > /dev/null 2>&1
      cat <<EOF > "$wrapscript.$interp"
  #!/bin/sh
@@ -225,7 +219,7 @@ export  
PYTHONPATH="${prefix}/usr/lib/lilypond/current/python:${prefix}/usr/share
  export GUILE_LOAD_PATH="${prefix}/usr/share/lilypond/current"
  export LD_LIBRARY_PATH="${prefix}/usr/lib:${dollar}LD_LIBRARY_PATH"
  me=${backquote}basename ${dollar}0${backquote}
-exec "${prefix}/usr/bin/$interp"  
${callmain} "${prefix}/usr/bin/${dollar}me" $expandargs
+exec "${prefix}/usr/bin/$interp" "${prefix}/usr/bin/${dollar}me"  
$expandargs
  EOF
      chmod +x "$wrapscript.$interp"
  done



_______________________________________________
lilypond-devel mailing list
[hidden email]
https://lists.gnu.org/mailman/listinfo/lilypond-devel