Ticket #26454: patch-src-makexml.diff

./src/makexml

@@ -128 +128 @@
 # Backslash-escape the given special character (and any EOLs)
 # Usage:
 #    sedprep "$TEXT" /
-#    echo $TEXT | sed "s/PATTERN/$(sedprep "$REPLACEMENT" /)/"
+#    echo $TEXT | gsed "s/PATTERN/$(sedprep "$REPLACEMENT" /)/"
 function sedprep ()
 {
     delim=${2:-/}
-    echo "$1" |sed -e 's/[\&'"$delim"']/\\&/g' -e '$!s,$,\\,';
+    echo "$1" |gsed -e 's/[\&'"$delim"']/\\&/g' -e '$!s,$,\\,';
 }
 
 # ==========================================================
@@ -401 +401 @@
 
     # Fill in the NEXT command for the previous slide, if there was one
     NEXT_TITLE="<next ref=\"play-title-$CUR_TITLE\"\/>"
-    SELECTION_XML=$( echo "$SELECTION_XML" | sed -e "s/__NEXT_TITLE__/$NEXT_TITLE/g" )
-    PLAYLIST_XML=$( echo "$PLAYLIST_XML" | sed -e "s/__NEXT_TITLE__/$NEXT_TITLE/g" )
+    SELECTION_XML=$( echo "$SELECTION_XML" | gsed -e "s/__NEXT_TITLE__/$NEXT_TITLE/g" )
+    PLAYLIST_XML=$( echo "$PLAYLIST_XML" | gsed -e "s/__NEXT_TITLE__/$NEXT_TITLE/g" )
 
     # --------------------------
     # If doing a still-image slideshow, use segment/selection
@@ -501 +501 @@
 
     # Fill in titleset menu buttons
     MENU_XML=$(echo "$MENU_XML" | \
-        sed -e "s/__MENU_BUTTONS__/$(sedprep "$MENU_BUTTONS" /)/g")
+        gsed -e "s/__MENU_BUTTONS__/$(sedprep "$MENU_BUTTONS" /)/g")
 
     # Fill in the POST command. If there is a menu to jump back to, use that;
     # otherwise, do not insert a POST command.
@@ -512 +512 @@
     else
       POST_CMD=""
     fi
-    TS_TITLES=$( echo "$TS_TITLES" | sed -e "s/__POST_CMD__/$POST_CMD/g" )
+    TS_TITLES=$( echo "$TS_TITLES" | gsed -e "s/__POST_CMD__/$POST_CMD/g" )
 
     # Append titleset info to ALL_MENU_XML
     if ! $FORCE_TITLESETS || ! $HAVE_TOP_MENU; then
@@ -558 +558 @@
     # Fill in menu title selections ("buttons")
     # and remove any remaining __NEXT_TITLE__s
     SELECTION_XML=$(echo "$SELECTION_XML" | \
-        sed -e "s/__MENU_BUTTONS__/$(sedprep "$MENU_BUTTONS" /)/g" -e "s/__NEXT_TITLE__//g")
-    PLAYLIST_XML=$(echo "$PLAYLIST_XML" | sed -e "s/__NEXT_TITLE__//g")
+        gsed -e "s/__MENU_BUTTONS__/$(sedprep "$MENU_BUTTONS" /)/g" -e "s/__NEXT_TITLE__//g")
+    PLAYLIST_XML=$(echo "$PLAYLIST_XML" | gsed -e "s/__NEXT_TITLE__//g")
 
     # Append new PBC menus/playlists to PBC_XML
     PBC_XML=`cat << EOF
@@ -716 +716 @@
 
 # Fill in top menu buttons
 TOP_MENU_XML=$(echo "$TOP_MENU_XML" | \
-    sed -e "s/__TOP_MENU_BUTTONS__/$(sedprep "$TOP_MENU_BUTTONS" /)/g")
+    gsed -e "s/__TOP_MENU_BUTTONS__/$(sedprep "$TOP_MENU_BUTTONS" /)/g")
 
 # If there is a top menu with no other menus, print an error and
 # a suggestion that user specify -menu instead of -topmenu
@@ -801 +801 @@
 fi
 
 # Remove blank lines and write final result to output file
-echo "$FINAL_DISC_XML" | sed -e '/^ *$/d' > "$OUT_PREFIX.xml"
+echo "$FINAL_DISC_XML" | gsed -e '/^ *$/d' > "$OUT_PREFIX.xml"
 
 echo "Done. The resulting XML was written to $OUT_PREFIX.xml."