Ticket #38150: patch-sed.diff

scripts/duration

@@ -137 +137 @@
         # 5) start with one or more chars, then '.', then three chars, then one or more chars (for 'evt' etc.)
         case5='/^.+\.[^.]{3}\.([^.-]*)+(-shifted)?$/'
 
-        extension=$(basename $filename | sed -r -e "$case1 s//\1/;$case2 s//\1/;$case3 s//\1/;$case4 s//\1/;$case5 s//\1/")
+        extension=$(basename $filename | sed -E -e "$case1 s//\1/;$case2 s//\1/;$case3 s//\1/;$case4 s//\1/;$case5 s//\1/")
 
         # Compute duration in ms
         case $extension in

scripts/ndm_functions

@@ -78 +78 @@
 # Print error message
 echo_error()
 {
-        indent=$(echo "$1"|sed -r 's/^([ ]*).*/\1/')
+        indent=$(echo "$1"|sed -E 's/^([ ]*).*/\1/')
         message=$(echo "$1"|sed 's/^ *//g')
 
         echo -en "$RED" >&2
@@ -89 +89 @@
 # Print warning message
 echo_warning()
 {
-        indent=$(echo "$1"|sed -r 's/^([ ]*).*/\1/')
+        indent=$(echo "$1"|sed -E 's/^([ ]*).*/\1/')
         message=$(echo "$1"|sed 's/^ *//g')
 
         echo -en "$BLUE" >&2
@@ -111 +111 @@
 #                       break
 #               fi
 #       done
-#       indent=$(echo "$1"|sed -r 's/^([ ]*).*/\1/')
+#       indent=$(echo "$1"|sed -E 's/^([ ]*).*/\1/')
 #       message=$(echo "$1"|sed 's/^ *//g')
 #
         echo $*
@@ -469 +469 @@
         # Start with the 'easy' ones
         date=$(filename_date $dirname)
         [ -z "$date" ] && return
-        prefix=$(echo $dirname|sed -r '/(.*)-'$date'.*/!d;s//\1/')
+        prefix=$(echo $dirname|sed -E '/(.*)-'$date'.*/!d;s//\1/')
 
         # Deal with the 'hard' end of the filename
         description=${dirname#$prefix-$date}
         if [ -z "$suffix" ] && ! $no_suffix
         then
-                suffix=$(echo $description|sed -r '/.*-(.*)/!d;s//\1/')
+                suffix=$(echo $description|sed -E '/.*-(.*)/!d;s//\1/')
         fi
         description=${description%$suffix}
         description=${description%-}
@@ -535 +535 @@
         # Start with the 'easy' ones
         date=$(filename_date $filename)
         [ -z "$date" ] && return
-        prefix=$(echo $filename|sed -r '/(.*)-'$date'.*/!d;s//\1/')
-        nn=$(echo $filename|sed -r '/'$prefix'-'$date'-([0-9]{2})-.*/!d;s//\1/')
-        extension=$(echo $filename|sed -r '/.*[.](.*)/!d;s//\1/')
+        prefix=$(echo $filename|sed -E '/(.*)-'$date'.*/!d;s//\1/')
+        nn=$(echo $filename|sed -E '/'$prefix'-'$date'-([0-9]{2})-.*/!d;s//\1/')
+        extension=$(echo $filename|sed -E '/.*[.](.*)/!d;s//\1/')
         [ ! -z "$extension" ] && p_extension=.$extension
 
         # Special case: evt files end in .ccc.evt where 'c' is any character
         if [ "$extension" == "evt" ]
         then
-                evt=$(echo $filename|sed -r '/.*[.](.{3})[.]'$extension'/!d;s//\1/')
+                evt=$(echo $filename|sed -E '/.*[.](.{3})[.]'$extension'/!d;s//\1/')
                 [ ! -z "$evt" ] && p_evt=.$evt
         fi
 
         # Deal with the 'hard' end of the filename
-        end=$(echo $filename|sed -r '/'$prefix'-'$date'-'$nn'-(.*)'$p_evt$p_extension'/!d;s//\1/')
-        NNN=$(echo $end|sed -r '/.*-([0-9]+).*/!d;s//\1/')
+        end=$(echo $filename|sed -E '/'$prefix'-'$date'-'$nn'-(.*)'$p_evt$p_extension'/!d;s//\1/')
+        NNN=$(echo $end|sed -E '/.*-([0-9]+).*/!d;s//\1/')
         description=${end%-$NNN}
         description=${description%$p_evt}
         if [ -z "$suffix" ] && ! $no_suffix
         then
-                suffix=$(echo $description|sed -r '/.*-(.*)/!d;s//\1/')
+                suffix=$(echo $description|sed -E '/.*-(.*)/!d;s//\1/')
         fi
         description=${description%-$suffix}
 
@@ -585 +585 @@
         local filename=$1
 
         # Case 1: date is specified as YYYYMMDD in the file name
-        d=$(echo $filename | sed -r '/.*([0-9]{8}).*/!d;s//\1/')
+        d=$(echo $filename | sed -E '/.*([0-9]{8}).*/!d;s//\1/')
         # Case 2: date is specified as YYYY-MM-DD in the file name
-        [ -z "$d" ] && d=$(echo $filename | sed -r '/.*([0-9]{4}-[0-9]{2}-[0-9]{2}).*/!d; s//\1/')
+        [ -z "$d" ] && d=$(echo $filename | sed -E '/.*([0-9]{4}-[0-9]{2}-[0-9]{2}).*/!d; s//\1/')
 
         echo $d
 }
@@ -601 +601 @@
         local d
 
         # Case 1: date is specified as YYYYMMDD in the file name
-        d=$(echo $1 | sed -r '/.*([0-9]{4})([0-9]{2})([0-9]{2}).*/!d;s//\1-\2-\3/')
+        d=$(echo $1 | sed -E '/.*([0-9]{4})([0-9]{2})([0-9]{2}).*/!d;s//\1-\2-\3/')
         # Case 2: date is specified as YYYY-MM-DD in the file name
-        [ -z "$d" ] && d=$(echo $1 | sed -r '/.*([0-9]{4}-[0-9]{2}-[0-9]{2}).*/!d; s//\1/')
+        [ -z "$d" ] && d=$(echo $1 | sed -E '/.*([0-9]{4}-[0-9]{2}-[0-9]{2}).*/!d; s//\1/')
 
         echo $d
 }
@@ -705 +705 @@
         for (( i=0;i<$n;i++ ))
         do
                 suffix=$(get_suffix $i ${suffixes[*]})
-                file_list="$file_list $(ls ../$directory-$suffix|cut -d/ -f 3|sed -r 's/(.*)-'$suffix'.*/\1/g')"
+                file_list="$file_list $(ls ../$directory-$suffix|cut -d/ -f 3|sed -E 's/(.*)-'$suffix'.*/\1/g')"
         done
 
         # List all sessions

scripts/ndm_recolorchannels

@@ -77 +77 @@
         command='/'$s'/N;/'$s'/N;/'$s'/s/#....../#'${color[$i]}'/g;'$command
 done
 
-[ ! -z "$command" ] && sed -i -e $command $file
+[ ! -z "$command" ] && sed -i '' -e $command $file

scripts/ndm_start

@@ -267 +267 @@
                 then
                         echo_warning "directory name '$directory' does not seem to contain a date"
                 else
-                        sed -i 's/<date>.*<\/date>/<date>'$d'<\/date>/' $template.xml
+                        sed -i '' 's/<date>.*<\/date>/<date>'$d'<\/date>/' $template.xml
                 fi
                 if [ -f $directory.xml ] && ! diff -I '<date>' -q $template.xml $directory.xml >/dev/null
                 then

scripts/ndm_transcodevideo

@@ -56 +56 @@
 # // Process
 # ////////////////////////////////////////////////////////////////////////////////////////////////
 
-input_codec=$(ffmpeg -i $video_file 2>&1|grep "Video:"|sed -r 's/.*Video: ([0-9A-Za-z]{4}).*/\1/')
+input_codec=$(ffmpeg -i $video_file 2>&1|grep "Video:"|sed -E 's/.*Video: ([0-9A-Za-z]{4}).*/\1/')
 if [ "$input_codec" == "IV50" ] && [ "$(uname -m)" == "x86_64" ]
 then
         # Intel Indeo V5.0 (IV50) is a proprietary codec used by Spike2, that can be decoded only by the 32bit version

scripts/process_renameevents_SPWR

@@ -30 +30 @@
 [ -z "$(ls $session*evt 2> /dev/null)" ] && exit $NO_ERROR
 for eventfile in $session*evt
 do
-        sed -i \
+        sed -i '' \
                 -e 's/[[:space:]]0$/\tStimulation/' \
                 -e 's/[[:space:]]1$/\tRipple Left/' \
                 -e 's/[[:space:]]2$/\tRipple Right/' \

scripts/process_renameevents_TMaze

@@ -27 +27 @@
 [ -z "$(ls $session*evt 2> /dev/null)" ] && exit $NO_ERROR
 for eventfile in $session*evt
 do
-        sed -i \
+        sed -i '' \
                 -e 's/[[:space:]]0$/\tTurn left/' \
                 -e 's/[[:space:]]1$/\tTurn right/' \
                 -e 's/[[:space:]]100$/\tTrial start/' \