Ticket #26454: patch-src-todisc.diff
File patch-src-todisc.diff, 19.3 KB (added by danielb@…, 14 years ago) |
---|
-
./src/todisc
old new 66 66 # check if symlink in /tmp exists and use time stamped link if so 67 67 WORK_DIR="/tmp/todisc-work" 68 68 69 LOG_FILE=$( readlink -f todisc.log)69 LOG_FILE=$(greadlink -f todisc.log) 70 70 OUT_PREFIX="" 71 71 TV_STANDARD=ntsc 72 72 MENU_LEN=( 20 ) … … 264 264 test -e "$LOG_FILE" && \ 265 265 printf "%s\n%s %s\n%s\n" "$ME" "$ME" "$SEPARATOR" "$ME" >> "$LOG_FILE" 266 266 else 267 sed "s/ */ /g;s/^ *//" <<< "$@" | fold -bs267 gsed "s/ */ /g;s/^ *//" <<< "$@" | fold -bs 268 268 test -e "$LOG_FILE" && \ 269 printf "%s %s\n" "$ME" "$@" | sed "s/ */ /g;s/^ *//" |269 printf "%s %s\n" "$ME" "$@" | gsed "s/ */ /g;s/^ *//" | 270 270 fold -bs >> "$LOG_FILE" 271 271 fi 272 272 } … … 276 276 # Returns: Exit status of the subprocess 277 277 # To filter/prettify the subprocess output before writing it to the log file, 278 278 # set the LOG_FILTER variable before calling this function, to e.g. 279 # LOG_FILTER=" sed 's/\r/\r\n/g'" # Replace LF with CR/LF279 # LOG_FILTER="gsed 's/\r/\r\n/g'" # Replace LF with CR/LF 280 280 # ****************************************************************************** 281 281 282 282 # Print script name, usage notes, and optional error message, then exit. … … 318 318 319 319 format_output() 320 320 { 321 sed "s/ */ /g;s/^ *//"|fold -bs321 gsed "s/ */ /g;s/^ *//"|fold -bs 322 322 } 323 323 324 324 get_font() 325 325 { 326 326 # If there is a filename extension, find the absolute path 327 327 if grep -q '\...*$' <<< "$1"; then 328 readlink -f "$1"328 greadlink -f "$1" 329 329 # Otherwise, use the literal name 330 330 else 331 331 echo "$1" … … 345 345 audio_length() 346 346 { 347 347 mplayer -noconsolecontrols -vo null -ao pcm:fast:file=/dev/null "$1" \ 348 2>&1 | tr '\r' '\n' | grep ^A: | tail -1 | sed s/^.*A:// | awk '{print $1}'348 2>&1 | tr '\r' '\n' | grep ^A: | tail -1 | gsed s/^.*A:// | awk '{print $1}' 349 349 } 350 350 cleanup() 351 351 { … … 624 624 yecho 625 625 fi 626 626 [[ $this_set = "group" ]] && echo -e "Stats for" \ 627 $( readlink -f "${FILES_IN[i]}") "\n" || \627 $(greadlink -f "${FILES_IN[i]}") "\n" || \ 628 628 echo -e "Stats for" "${FILES_IN[i]}" "\n" 629 629 echo -e \ 630 630 " video codec: " \ … … 713 713 fi 714 714 if test ${#FILES_TO_ENCODE[@]} -lt 12 && ! $SINGLE_SLIDESHOW; then 715 715 for i in "${FILES_TO_ENCODE[@]}"; do 716 this_file=$( readlink -f "$i")716 this_file=$(greadlink -f "$i") 717 717 test -n "$this_file" && yecho " $this_file" 718 718 done 719 719 fi … … 742 742 yecho 743 743 fi 744 744 for i in "${!FILES_TO_ENCODE[@]}"; do 745 IN=$( readlink -f "${FILES_TO_ENCODE[i]}")745 IN=$(greadlink -f "${FILES_TO_ENCODE[i]}") 746 746 if $group_set; then 747 747 is_image=${grp_file_is_image[i]} 748 748 # we will replace the symlink with actual mpeg … … 770 770 fi 771 771 # AUDIO_FADE=false # do not fade silence FIXME ??? 772 772 else # not an image file - outfile goes beside infile 773 THIS_FILE=$( readlink -f "${FILES_TO_ENCODE[i]}")773 THIS_FILE=$(greadlink -f "${FILES_TO_ENCODE[i]}") 774 774 yecho "Converting $THIS_FILE" 775 775 echo 776 776 countdown 3 … … 896 896 unset chapt_len_array[${#chapt_len_array[@]}-1] 897 897 chapter_points=$( running_total <<< ${chapt_len_array[@]} ) 898 898 # remove trailing space 899 chapter_points=$( sed 's/[ \t]*$//' <<< $chapter_points)899 chapter_points=$(gsed 's/[ \t]*$//' <<< $chapter_points) 900 900 remainder=$( bc <<< "$adjusted_length % $chapter_length" \ 901 901 2>/dev/null) 902 902 (( ${nochapt[index]} )) && local group_chapters[x++]=0 || … … 926 926 for number in ${group_chapters[d]}; do 927 927 new_element="$new_element $(format_seconds $number)," 928 928 grp_chapters[d]="${grp_chapters[d]} $number" 929 grp_chapters[d]=$( sed 's/[ \t]*$//' <<< ${grp_chapters[d]})929 grp_chapters[d]=$(gsed 's/[ \t]*$//' <<< ${grp_chapters[d]}) 930 930 done 931 931 local array[d]=$new_element 932 932 unset new_element … … 1275 1275 </menus> 1276 1276 </vmgm> 1277 1277 EOF 1278 ) | sed '/^ *$/d' >> "$DVDAUTHOR_XML"1278 ) |gsed '/^ *$/d' >> "$DVDAUTHOR_XML" 1279 1279 get_genopts "${args[@]}" 1280 1280 1281 1281 #################### test for incompatible options ####################### … … 1577 1577 fi 1578 1578 # find out where vhook lives for ffmpeg 1579 1579 ffmpeg_prefix=$(which ffmpeg) 1580 ffmpeg_prefix=$( sed 's/\/bin\/ffmpeg//g' <<< "$ffmpeg_prefix")1580 ffmpeg_prefix=$(gsed 's/\/bin\/ffmpeg//g' <<< "$ffmpeg_prefix") 1581 1581 imlib2_vhook="$ffmpeg_prefix/lib/vhook/imlib2.so" 1582 1582 1583 1583 # check for badly compiled or otherwise unusable vhook … … 1650 1650 "$outdir"/%06d.png) 1651 1651 yecho "${FFMPEG_CMD[@]}" | strings 1652 1652 "${FFMPEG_CMD[@]}" 2>&1 | strings >> "$LOG_FILE" 1653 largest_png=$( du -s "$outdir"/*.png|sort -r |1653 largest_png=$(gdu -s "$outdir"/*.png|sort -r | 1654 1654 awk 'NR>1{exit};1 {print $2}') 1655 1655 mv "$largest_png" "$PREVIEW_IMG" 1656 1656 yecho "Removing temporary preview files" … … 1744 1744 in_files=( "${IN_FILES[@]}" ) 1745 1745 else 1746 1746 for f in ${!grouping[@]}; do 1747 in_files[f]=$( readlink -f "${grouping[f]}")1747 in_files[f]=$(greadlink -f "${grouping[f]}") 1748 1748 done 1749 1749 fi 1750 1750 for ((i=0; i<${#in_files[@]}; i++)); do … … 1928 1928 done) 1929 1929 fadeout:1 1930 1930 EOF 1931 ) | sed '/^$/d;s/^[ \t]*//' > "$WORK_DIR/dvd-slideshow.conf"1931 ) | gsed '/^$/d;s/^[ \t]*//' > "$WORK_DIR/dvd-slideshow.conf" 1932 1932 } 1933 1933 1934 1934 transition_slide() … … 2237 2237 if $incoming_vids || [[ $sshows -eq 1 && $inc_files -lt 1 ]]; then 2238 2238 for f in ${!ARGS_ARRAY[@]}; do 2239 2239 FILENAMES[f]=${ARGS_ARRAY[f]} 2240 filenames[f]=$( readlink -f "${ARGS_ARRAY[f]}")2240 filenames[f]=$(greadlink -f "${ARGS_ARRAY[f]}") 2241 2241 done 2242 2242 if $incoming_slides; then 2243 2243 SLIDESHOW=( ${SLIDESHOW[@]} : ) # is this a slideshow ? … … 2252 2252 ! $GROUPING && mk_workdir 2253 2253 unset group groupkey grp x 2254 2254 for ((i=0; i<${#ARGS_ARRAY[@]}; i++)); do 2255 grp[x++]=$( readlink -f "${ARGS_ARRAY[i]}")2255 grp[x++]=$(greadlink -f "${ARGS_ARRAY[i]}") 2256 2256 done 2257 2257 unset x 2258 2258 [[ -z ${FILES[@]} ]] && ss_index=0 || ss_index=${#FILES[@]} 2259 2259 SLIDESHOW[ss_index]=: # is this a slideshow ? 2260 FILES[ss_index]=$( readlink -f "${ARGS_ARRAY[0]}")2260 FILES[ss_index]=$(greadlink -f "${ARGS_ARRAY[0]}") 2261 2261 GROUP_IN_FILES=( "${GROUP_IN_FILES[@]}" "${grp[@]}" ) 2262 2262 groupkey=${#FILES[@]} 2263 2263 GROUP[groupkey-1]=${#grp[@]} … … 2301 2301 get_listargs "$@" 2302 2302 unset group groupkey grp x 2303 2303 for ((i=1; i<${#ARGS_ARRAY[@]}; i++)); do 2304 grp[x++]=$( readlink -f "${ARGS_ARRAY[i]}")2304 grp[x++]=$(greadlink -f "${ARGS_ARRAY[i]}") 2305 2305 done 2306 2306 GROUP_IN_FILES=( "${GROUP_IN_FILES[@]}" "${grp[@]}" ) 2307 2307 ((${ARGS_ARRAY[0]})) 2>/dev/null || usage_error "Arguments to \ … … 2339 2339 shift 2340 2340 get_listargs "$@" 2341 2341 for f in ${!ARGS_ARRAY[@]}; do 2342 SLIDESHOW_MENU_THUMBS[f]=$( readlink -f "${ARGS_ARRAY[f]}")2342 SLIDESHOW_MENU_THUMBS[f]=$(greadlink -f "${ARGS_ARRAY[f]}") 2343 2343 done 2344 2344 ;; 2345 2345 "-submenu-titles" ) … … 2569 2569 shift 2570 2570 get_listargs "$@" 2571 2571 if [[ -n ${ARGS_ARRAY[@]} ]]; then 2572 SLIDESHOW_CONF=$( readlink -f "${ARGS_ARRAY[0]}")2572 SLIDESHOW_CONF=$(greadlink -f "${ARGS_ARRAY[0]}") 2573 2573 fi 2574 2574 USE_DVD_SLIDESHOW=: 2575 2575 ;; … … 2666 2666 ;; 2667 2667 "-background" ) 2668 2668 shift 2669 BACKGROUND=$( readlink -f "$1")2669 BACKGROUND=$(greadlink -f "$1") 2670 2670 USERS_BACKGROUND=: 2671 2671 ! [[ -e "$BACKGROUND" ]] && \ 2672 2672 usage_error "background \"$BACKGROUND\" does not exist" … … 2675 2675 shift 2676 2676 get_listargs "$@" 2677 2677 for f in ${!ARGS_ARRAY[@]}; do 2678 SM_BACKGROUND[f]=$( readlink -f "${ARGS_ARRAY[f]}")2678 SM_BACKGROUND[f]=$(greadlink -f "${ARGS_ARRAY[f]}") 2679 2679 ! [[ -e ${SM_BACKGROUND[f]} ]] && usage_error \ 2680 2680 "submenu background \"$SM_BACKGROUND\" does not exist" 2681 2681 done … … 2683 2683 "-intro" ) 2684 2684 shift 2685 2685 DO_INTRO=: 2686 INTRO_CLIP=$( readlink -f "$1")2686 INTRO_CLIP=$(greadlink -f "$1") 2687 2687 ! [[ -e "$INTRO_CLIP" ]] && \ 2688 2688 usage_error "intro clip \"$INTRO_CLIP\" does not exist" 2689 2689 ;; … … 2692 2692 get_listargs "$@" 2693 2693 unset f 2694 2694 for f in ${!ARGS_ARRAY[@]}; do 2695 SHOWCASE_FILE[f]=$( readlink -f "${ARGS_ARRAY[f]}")2695 SHOWCASE_FILE[f]=$(greadlink -f "${ARGS_ARRAY[f]}") 2696 2696 done 2697 2697 SHOWCASE=: 2698 2698 IMG_FMT="png" … … 2965 2965 if [[ $1 = "none" ]]; then 2966 2966 BG_AUDIO="none" # for switched menus 2967 2967 else 2968 BG_AUDIO=$( readlink -f "$1")2968 BG_AUDIO=$(greadlink -f "$1") 2969 2969 if [[ ! -e "$BG_AUDIO" ]]; then 2970 2970 usage_error "background audio \"$BG_AUDIO\" does not exist" 2971 2971 fi … … 2987 2987 usage_error "audio file \"${ARGS_ARRAY[i]}\" not found" 2988 2988 else 2989 2989 SM_AUDIO=( "${SM_AUDIO[@]}" \ 2990 "$( readlink -f "${ARGS_ARRAY[i]}")" )2990 "$(greadlink -f "${ARGS_ARRAY[i]}")" ) 2991 2991 fi 2992 2992 fi 2993 2993 done … … 3217 3217 elif [[ ! -e $2 ]]; then 3218 3218 usage_error " subtitle file $2 does not exist" 3219 3219 else 3220 TOVID_OPTS+=( "$1" "$( readlink -f "$2")" )3220 TOVID_OPTS+=( "$1" "$(greadlink -f "$2")" ) 3221 3221 fi 3222 3222 elif [[ $1 == "-config" ]]; then 3223 3223 if [[ ! -e $2 ]]; then 3224 3224 usage_error "config file $2 does not exist" 3225 3225 else 3226 TOVID_OPTS+=( "$1" "$( readlink -f "$2")" )3226 TOVID_OPTS+=( "$1" "$(greadlink -f "$2")" ) 3227 3227 fi 3228 3228 else 3229 3229 TOVID_OPTS+=( "$1" ) … … 3275 3275 fi 3276 3276 3277 3277 if $BURN; then 3278 if [[ ! -b $( readlink -f $BURN_DEVICE) ]]; then3278 if [[ ! -b $(greadlink -f $BURN_DEVICE) ]]; then 3279 3279 usage_error \ 3280 3280 "$BURN_DEVICE is not a valid block device file or link to a block device. 3281 3281 Are you sure your burner is \"${BURN_DEVICE}\"? Specify your burner with … … 3387 3387 3388 3388 # Make sure -out was provided and it is valid 3389 3389 if test -n "$OUT_PREFIX"; then 3390 OUT_DIR=$( readlink -f "$OUT_PREFIX")3390 OUT_DIR=$(greadlink -f "$OUT_PREFIX") 3391 3391 if [[ ! -d ${OUT_DIR%/*} ]]; then 3392 OUT_PATH=$( readlink -m "$OUT_PREFIX")3392 OUT_PATH=$(greadlink -m "$OUT_PREFIX") 3393 3393 usage_error "The -out path ${OUT_PATH%/*}/ does not exist" 3394 3394 fi 3395 3395 if egrep -q '<|>|&' <<< "$OUT_DIR"; then … … 3530 3530 # disallow spaces in thumb titles for text button style 3531 3531 if [ "$BUTTON_STYLE" = "text" ]; then 3532 3532 for ((i=0; i<${#TITLES[@]}; i++)); do 3533 T=$( sed 's/^[ \t]*//;s/[ \t]*$//' <<< "${TITLES[i]}")3533 T=$(gsed 's/^[ \t]*//;s/[ \t]*$//' <<< "${TITLES[i]}") 3534 3534 if grep " " <<< "$T" >/dev/null; then 3535 3535 echo "Sorry, a maximum of one consecutive space is allowed 3536 3536 in titles for text buttons. \"${TITLES[i]}\" has more than … … 3682 3682 "todisc from the tovid suite ($TOVID_VERSION) - log for `date`" \ 3683 3683 "$PATTERN" >> "$LOG_FILE" 3684 3684 # put the command line into the log file to aid debugging 3685 printf "%s\n%s\n" todisc "${args[@]}" | sed "s/ */ /g;s/^ *//" | fold -bs >> "$LOG_FILE"3685 printf "%s\n%s\n" todisc "${args[@]}" | gsed "s/ */ /g;s/^ *//" | fold -bs >> "$LOG_FILE" 3686 3686 # do some locale debugging 3687 3687 echo -e "\nYou are using the following locale settings:" >> "$LOG_FILE" 3688 3688 locale >> "$LOG_FILE" 2>&1 … … 3977 3977 # Get absolute pathnames of all files 3978 3978 if ! $VMGM_ONLY; then 3979 3979 for i in "${FILES[@]}"; do 3980 IN_FILES=("${IN_FILES[@]}" "$( readlink -f "$i")")3980 IN_FILES=("${IN_FILES[@]}" "$(greadlink -f "$i")") 3981 3981 (( ${#FILES[@]} < 12 )) && echo "Adding: $i" || spin "Adding: ${i##*/}" 3982 3982 done 3983 3983 fi … … 4125 4125 used ${CHAPT_ARRAY[i]}" 4126 4126 fi 4127 4127 # remove + sign and commas, count the number of chapters left 4128 str=$( sed 's/+/ /g;s/,/ /g' <<< ${CHAPTERS[i]})4128 str=$(gsed 's/+/ /g;s/,/ /g' <<< ${CHAPTERS[i]}) 4129 4129 for substr in $str; do [[ $substr != 0 ]] && newchapts+=($substr); done 4130 4130 CHAPTERS[i]=${#newchapts[@]} 4131 4131 done … … 4362 4362 #*slide_grp*.mpg are symlinks to the original images we have kept intact 4363 4363 mixgroup=( "$WORK_DIR"/${TSET_NUM}-slide_grp-*.mpg ) 4364 4364 for g in ${!mixgroup[@]}; do 4365 MIXFILES[g]=$( readlink -f "${mixgroup[g]}")4365 MIXFILES[g]=$(greadlink -f "${mixgroup[g]}") 4366 4366 MIXLINKS[g]=${mixgroup[g]} 4367 4367 # remove original link we can keep track of what is already encoded 4368 4368 rm -f "${MIXLINKS[g]}" … … 4522 4522 for ((i=0; i<${#TITLES[@]}; i++)); do 4523 4523 if [[ ${#TITLES[i]} -gt 35 || \ 4524 4524 $(echo -e "${TITLES[i]}" |wc -l) -gt 1 ]]; then 4525 TITLE[i]=$( sed 's/^ *//'<<<${TITLES[i]//\\n/ }) # no spaces or \n4525 TITLE[i]=$(gsed 's/^ *//'<<<${TITLES[i]//\\n/ }) # no spaces or \n 4526 4526 TITLE[i]=${TITLE[i]:0:35} # cut down to 35 characters maximum 4527 4527 if [ ${#TITLES[i]} -gt 35 ]; then 4528 4528 echo " \"${TITLE[i]}...\" (${IN_FILES[i]})" # "..." … … 5495 5495 $SWITCHED && MPLAYER_SEEK_VAL=${SEEK_VAL[MENU_NUM-1]} 5496 5496 echo "Using mplayer to get framed images from the showcase video" 5497 5497 get_framed_pics "$SHOWCASE_VIDEO" >> "$LOG_FILE" 2>&1 5498 largest_png=$( du -s "$WORK_DIR"/000000*.png|sort -r |5498 largest_png=$(gdu -s "$WORK_DIR"/000000*.png|sort -r | 5499 5499 awk 'NR>1{exit};1 {print $2}') 5500 5500 mv -v "$largest_png" "$OUT" 5501 5501 rm -f "$WORK_DIR"/00000*.png … … 5579 5579 if [ "$SC_FRAMESTYLE" = "glass" ]; then 5580 5580 MPLAYER_SEEK_VAL=${SEEK_VAL[i]} 5581 5581 get_framed_pics "${IN_FILES[i]}" >> "$LOG_FILE" 2>&1 5582 largest_png=$( du -s $WORK_DIR/000*[0-9].png | sort -r |5582 largest_png=$(gdu -s $WORK_DIR/000*[0-9].png | sort -r | 5583 5583 awk 'NR>1{exit};1 {print $2}') 5584 5584 mv -f $largest_png $WORK_DIR/pics/$i/$(printf "%06d%s" 0 .$IMG_FMT) 5585 5585 rm -f "$WORK_DIR"/000*[0-9].png … … 6698 6698 echo ". . . Getting stats on grouped files now . . ." 6699 6699 echo 6700 6700 for u in ${!grouping[@]}; do 6701 CUR_VID=$( readlink -f "${grouping[u]}")6701 CUR_VID=$(greadlink -f "${grouping[u]}") 6702 6702 spin "Getting stats on "${CUR_VID##*/}"" 6703 6703 group_idvid_stats[u]=$(idvid -terse -accurate "$CUR_VID" 2>/dev/null) 6704 6704 if [ -s "$CUR_VID.nav_log" ]; then … … 7356 7356 </stream> 7357 7357 </subpictures> 7358 7358 EOF 7359 ) | sed '/^ *$/d' > "$SPUMUX_XML"7359 ) |gsed '/^ *$/d' > "$SPUMUX_XML" 7360 7360 7361 7361 if $SUB_MENU; then 7362 7362 JUMP=menu … … 7526 7526 echo "$POST" 7527 7527 echo " </pgc>" 7528 7528 echo " <pgc>" 7529 done | sed '$d'7529 done | gsed '$d' 7530 7530 fi) 7531 7531 </menus> 7532 7532 <titles> … … 7674 7674 echo -e "</dvdauthor>" 7675 7675 fi) 7676 7676 EOF 7677 ) | sed '/^ *$/d' >> "$DVDAUTHOR_XML"7677 ) |gsed '/^ *$/d' >> "$DVDAUTHOR_XML" 7678 7678 ############################################################################## 7679 7679 # Animenu stuff # 7680 7680 ############################################################################## … … 7859 7859 else 7860 7860 CUR_FILE="${IN_FILES[i]}" 7861 7861 fi 7862 navlog=$( readlink -f "${CUR_FILE}").nav_log7862 navlog=$(greadlink -f "${CUR_FILE}").nav_log 7863 7863 if [[ -s $navlog ]]; then 7864 7864 NAVSEEK="--nav_seek" && NAVLOG="$navlog" 7865 7865 else … … 7871 7871 $NAVSEEK "$NAVLOG" -o "${PICS_OUT[@]}" -f \ 7872 7872 $FRAME_RATE -Z ${GEO_ARRAY[C]},fast -c $t -y $SM_IMG_FMT,null) 7873 7873 echo "Running ${TCODE_CMD[@]}" | 7874 sed 's/ */ /g'|sed -e "s/^ *//"|tee -a >> "$LOG_FILE"7875 # sed 's/ */ /g'|sed -e "s/^ *//"|fold -bs >> "$LOG_FILE"7874 gsed 's/ */ /g'|gsed -e "s/^ *//"|tee -a >> "$LOG_FILE" 7875 #gsed 's/ */ /g'|gsed -e "s/^ *//"|fold -bs >> "$LOG_FILE" 7876 7876 echo >> "$LOG_FILE" 7877 7877 run_transcode() 7878 7878 { … … 8015 8015 for ((b=0; b<${CHAPTERS[i]}; b++)); do 8016 8016 IMGS=( "${IMGS[@]}" $(find $WORK_DIR/animenu/$b \ 8017 8017 -name \*.$SM_IMG_FMT| sort 2>/dev/null | head -n $a | 8018 sed -n -e "$a p") )8018 gsed -n -e "$a p") ) 8019 8019 done 8020 8020 IM_CMD=(convert "${IMGS[@]}" -bordercolor '#6E6E6E' \ 8021 8021 -border $THUMB_FRAME_SIZE miff:-) … … 8197 8197 echo -e "Running: 8198 8198 sox $WORK_DIR/menu$s.wav $WORK_DIR/menu$s-processed.wav fade t 8199 8199 $SM_FADE ${SUBMENU_AUDIOLEN[s]} $SM_FADE" | 8200 sed 's/ */ /g' | format_output8200 gsed 's/ */ /g' | format_output 8201 8201 sox -q $WORK_DIR/menu$s.wav $WORK_DIR/menu$s-processed.wav \ 8202 8202 fade t $SM_FADE ${SUBMENU_AUDIOLEN[s]} $SM_FADE 8203 8203 rm $WORK_DIR/menu$s.wav … … 8329 8329 num_procs=0 8330 8330 for p in ${!SC_PICS[@]}; do 8331 8331 ((num_procs++)) # how many processes are running 8332 this_pic=$( sed 's,.*/,,;s/^0*//;s/.png//' <<< "${SC_PICS[p]}")8332 this_pic=$(gsed 's,.*/,,;s/^0*//;s/.png//' <<< "${SC_PICS[p]}") 8333 8333 pic="${SC_PICS[p]}" 8334 8334 # if glass and either wave or rotate 8335 8335 if [ "$SC_FRAMESTYLE" = "glass" ] && \ … … 9189 9189 for ((x=1; x<=V_TOTAL; x++)); do 9190 9190 yecho "Running spumux "$WORK_DIR/submenu${x}_spumux.xml" < \ 9191 9191 $WORK_DIR/menu${x}.mpg > \ 9192 $( sed 's/\(.*\)menu/\1Menu/' <<< $WORK_DIR/menu${x}.mpg)"|fold -bs9192 $(gsed 's/\(.*\)menu/\1Menu/' <<< $WORK_DIR/menu${x}.mpg)"|fold -bs 9193 9193 spumux "$WORK_DIR/submenu${x}_spumux.xml" < \ 9194 9194 $WORK_DIR/menu${x}.mpg > \ 9195 $( sed 's/\(.*\)menu/\1Menu/' <<< $BASEDIR/${TSET_NUM}-menu${x}.mpg) \9195 $(gsed 's/\(.*\)menu/\1Menu/' <<< $BASEDIR/${TSET_NUM}-menu${x}.mpg) \ 9196 9196 2>> "$LOG_FILE" 9197 9197 done 9198 9198 fi