@matheusbsbs / matheus-bagliano / commits / 20fa04ea6b
Fork 0

mergetool: Replace use of "echo -n" with printf(1) to be more portable

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

Theodore Ts'o committed Mar 27, 2007 at 12:12 UTC 20fa04ea6bad985d74bd2c0180701f1c69272801
1 file changed +12 -14
git-mergetool.sh
+12 -14
@@ -44,18 +44,16 @@ function describe_file () {
44 branch="$2"
45 file="$3"
46
47 - echo -n " "
47 + printf " "
48 if test -z "$mode"; then
49 - echo -n "'$path' was deleted"
49 + printf "'%s' was deleted" "$path"
50 elif is_symlink "$mode" ; then
51 - echo -n "'$path' is a symlink containing '"
52 - cat "$file"
53 - echo -n "'"
51 + printf "'%s' is a symlink containing '%s'" "$path" "$file"
52 else
53 if base_present; then
56 - echo -n "'$path' was created"
54 + printf "'%s' was created" "$path"
55 else
58 - echo -n "'$path' was modified"
56 + printf "'%s' was modified" "$path"
57 fi
58 fi
59 echo " in the $branch branch"
@@ -64,7 +62,7 @@ function describe_file () {
62
63 resolve_symlink_merge () {
64 while /bin/true; do
67 - echo -n "Use (r)emote or (l)ocal, or (a)bort? "
65 + printf "Use (r)emote or (l)ocal, or (a)bort? "
66 read ans
67 case "$ans" in
68 [lL]*)
@@ -88,7 +86,7 @@ resolve_symlink_merge () {
86
87 resolve_deleted_merge () {
88 while /bin/true; do
91 - echo -n "Use (m)odified or (d)eleted file, or (a)bort? "
89 + printf "Use (m)odified or (d)eleted file, or (a)bort? "
90 read ans
91 case "$ans" in
92 [mM]*)
@@ -157,7 +155,7 @@ merge_file () {
155 echo "Normal merge conflict for $path:"
156 describe_file "$local_mode" "local" "$LOCAL"
157 describe_file "$remote_mode" "remote" "$REMOTE"
160 - echo -n "Hit return to start merge resolution tool ($merge_tool): "
158 + printf "Hit return to start merge resolution tool (%s): " "$merge_tool"
159 read ans
160
161 case "$merge_tool" in
@@ -193,7 +191,7 @@ merge_file () {
191 else
192 while true; do
193 echo "$path seems unchanged."
196 - echo -n "Was the merge successful? [y/n] "
194 + printf "Was the merge successful? [y/n] "
195 read answer < /dev/tty
196 case "$answer" in
197 y*|Y*) status=0; break ;;
@@ -225,7 +223,7 @@ merge_file () {
223 else
224 while true; do
225 echo "$path seems unchanged."
228 - echo -n "Was the merge successful? [y/n] "
226 + printf "Was the merge successful? [y/n] "
227 read answer < /dev/tty
228 case "$answer" in
229 y*|Y*) status=0; break ;;
@@ -346,12 +344,12 @@ if test $# -eq 0 ; then
344 echo Merging the files: $files
345 git ls-files -u | sed -e 's/^[^ ]* //' | sort -u | while read i
346 do
349 - echo ""
347 + printf "\n"
348 merge_file "$i" < /dev/tty > /dev/tty
349 done
350 else
351 while test $# -gt 0; do
354 - echo ""
352 + printf "\n"
353 merge_file "$1"
354 shift
355 done