Do not use `echo -n', use `printf' instead.

Yes, we're in 2007, but Apple is shipping "the world's most advanced OS"
with a version of /bin/sh that doesn't even have a working `echo' builtin.
I mean, it's not like it's the kind of builtin that's *hard* to get right.

Signed-off-by: Benoit Sigoure <[email protected]>

diff --git a/svn-wrapper.sh b/svn-wrapper.sh
index fe6a8c4..7935fa1 100755 (executable)
--- a/svn-wrapper.sh
+++ b/svn-wrapper.sh
@@ -197,7 +197,7 @@ notice()
 # yesno question
 yesno()
 {
-  echo -n "$@ [y/N] "
+  printf "$@ [y/N] "
   read answer || return 1
   case $answer in
     y* | Y*) return 0;;
@@ -211,7 +211,7 @@ yesno()
 # the answer is stored in $yesnoproceed_res which is /yes|new|proceed/
 yesnewproceed()
 {
-  echo -n "$@ [(y)es/(p)roceed/(u)p+proceed/(N)ew] "
+  printf "$@ [(y)es/(p)roceed/(u)p+proceed/(N)ew] "
   read answer || return 1
   case $answer in
     y* | Y*) yesnoproceed_res=yes;     return 0;;
@@ -443,7 +443,7 @@ $content_type"
     */sendEmail)
        if [ x"$SMTP" = x ]; then
          warn 'my_sendmail: (sendEmail) please tell me the SMTP server to use'
-         echo -n 'STMP server: '
+         printf 'STMP server: '
          read SMTP || abort 'could not read the SMTP server'
          notice "hint: you can export SMTP=$SMTP if you don't want to be asked"
        fi
@@ -750,7 +750,7 @@ Do you want to proceed without using a ChangeLog?'; then
       i=$((i + 1))
       echo "$i. $a_chlog_dir/ChangeLog"
     done
-    echo -n "Which ChangeLog do you want to use? [1-$i] "
+    printf "Which ChangeLog do you want to use? [1-$i] "
     read chlog_no || abort 'Cannot read answer on stdin.'
 
     case $chlog_no in
@@ -793,7 +793,7 @@ Do you want to proceed without using a ChangeLog?'; then
       warn "make sure you don't want to \`svn add'
             any of the following files before committing:"
       echo "$conflicts" | sed "$sed_svn_st_color"
-      echo -n 'Type [ENTER] to continue :)' && read chiche_is_gay
+      printf 'Type [ENTER] to continue :)' && read chiche_is_gay
     fi
 
     # If there are changes in an svn:externals, advise the user to commit that
@@ -1314,7 +1314,7 @@ $mail_title"
     abort "Commit failed, $SVN returned $svn_commit_rv"
   }
 
-  echo -n 'Getting the revision number... '
+  printf 'Getting the revision number... '
   if $git_mode; then
     REV=`git rev-list --pretty=format:%h HEAD --max-count=1 | sed '1d;q'`
   else