[Quilt-dev] quilt vs bash 3.1

[Arnaud Patard]

Hi, 


I wanted to try latest quilt and I ran "make check". Instead of passing
all tests the following ones were failing : 
- applied.test
- mail.test
- snapshot.test
- snapshot2.test

After some tests, I found out that the test are failing only on bash
3.1. If I revert to bash 3.0 on the same box, the tests are succeeding.
(FYI, I've seen these failures with bash 3.1 on two differents distributions)

I've made some patches for that and I'm sending them with this
mail. Perrhaps, they're not the best way to solve the matter but at
least it should help to fix it.


Regards,
Arnaud Patard


Index: quilt-0.43/quilt/fork.in
===================================================================
--- quilt-0.43.orig/quilt/fork.in
+++ quilt-0.43/quilt/fork.in
@@ -82,7 +82,7 @@ else
        else
                new_patch="$base-2"
        fi
-       new_patch="$new_patch${top_patch:${#base}}"
+       new_patch="$new_patch${top_patch#$base}"
 fi
 
 new_patch=${new_patch#$QUILT_PATCHES/}

Index: quilt-0.43/quilt/mail.in
===================================================================
--- quilt-0.43.orig/quilt/mail.in
+++ quilt-0.43/quilt/mail.in
@@ -360,7 +360,7 @@ then
 fi
 
 if [ -z "$(sed -n -e '/^$/q' \
-                 -e $'s/^Subject:[ \t]*//ip' \
+                 -e 's/^Subject:[ \t]*//ip' \
               $introduction)" ]
 then
        if [ -z "$opt_message" ]
@@ -377,14 +377,14 @@ if [ -n "$opt_mbox" ]; then
        exec 1> $opt_mbox
 fi
 
-subject_prefix=$(sed -ne $'s/^Subject-Prefix:[ \t]*//p' $introduction)
+subject_prefix=$(sed -ne 's/^Subject-Prefix:[ \t]*//p' $introduction)
 [ -n "$subject_prefix" ] && subject_prefix="$subject_prefix "
 
 subject_prefix=${subject_prefix//\'/\'\'}
 subject_prefix=${subject_prefix//\//\\\/}
 p=${subject_prefix//@num@/$(printf %0*d ${#total} 0)}
 p=${p//@total@/$total}
-sed -e $'s/^\\(Subject:[ \t]\\)/\\1'"$p"'/' \
+sed -e 's/^\(Subject:[ \t]\)/\1'"$p"'/' \
     -e '/^Subject-Prefix:/d' \
 $introduction \
 | $QUILT_DIR/scripts/edmail --charset $opt_charset \
@@ -399,7 +399,7 @@ fi
 # increment the timestamp by one second and wait with sending until
 # that time has arrived. This allows MUAs to show the messages in the
 # correct order.
-last_ts=$(date '+%s' -d "$(sed -ne $'s/^Date:[ \t]*//p' $introduction)")
+last_ts=$(date '+%s' -d "$(sed -ne 's/^Date:[ \t]*//p' $introduction)")
 
 num=1
 for patch in "address@hidden"; do
@@ -451,7 +451,7 @@ for patch in "address@hidden"; do
                --replace-header Date="\"$new_date\"" \
                To Cc Bcc \
                $modify \
-       | sed -e $'s/^\\(Subject:[ \t]\\)/\\1'"$p"'/' \
+       | sed -e 's/^\(Subject:[ \t]\)/\1'"$p"'/' \
              -e '/^Subject-Prefix:/d' \
        | $QUILT_DIR/scripts/edmail --remove-empty-headers \
        | process_mail

Index: quilt-0.43/quilt/push.in
===================================================================
--- quilt-0.43.orig/quilt/push.in
+++ quilt-0.43/quilt/push.in
@@ -97,9 +97,9 @@ push_patch_args()
                patch_args "$patch"
        else
                set -- $(patch_args "$patch")
-               if [ "${*/-R}" != "$*" ]
+               if [ "${*#-R}" != "$*" ]
                then
-                       echo "${*/-R}"
+                       echo "${*#-R}"
                else
                        echo "$*" -R
                fi