Do not install backward compatibility links anymore.

This is a companion patch to 4f9dcf7e5cf6c82455925102d315daf3b833e6d6
which stops mentioning the old command names.  As promised, we do not
install symlinks to let people use backward compatibility names anymore.

cmd-rename.sh script is still shipped to help people who installed
previous git by hand to clean up the leftover symlinks.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Makefile b/Makefile
index 67c10302b66c2696d7ada9d6d7e03694b51690c9..357cb3ec8c9c2d1a694b386a413e84d946396534 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -413,7 +413,6 @@ check:
 install: $(PROGRAMS) $(SCRIPTS)
        $(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(bindir))
        $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(call shellquote,$(DESTDIR)$(bindir))
 install: $(PROGRAMS) $(SCRIPTS)
        $(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(bindir))
        $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(call shellquote,$(DESTDIR)$(bindir))

-       sh ./cmd-rename.sh $(call shellquote,$(DESTDIR)$(bindir))

        $(MAKE) -C templates install
        $(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR))
        $(INSTALL) $(PYMODULES) $(call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR))
        $(MAKE) -C templates install
        $(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR))
        $(INSTALL) $(PYMODULES) $(call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR))

diff --git a/cmd-rename.sh b/cmd-rename.sh
index 34e7f494ed000989276cad428d81a97316e995d3..992493de2218ad86d59e6a60e1ee3e01f5c7221d 100755 (executable)
--- a/cmd-rename.sh
+++ b/cmd-rename.sh
@@ -1,13 +1,21 @@
 #!/bin/sh
 #!/bin/sh

+#
+# If you installed git by hand previously, you may find this
+# script useful to remove the symbolic links that we shipped
+# for backward compatibility.
+#
+# Running this script with the previous installation directory
+# like this:
+#
+# $ cmd-rename.sh /usr/local/bin/
+#
+# would clean them.
+

 d="$1"
 test -d "$d" || exit
 while read old new
 do
        rm -f "$d/$old"
 d="$1"
 test -d "$d" || exit
 while read old new
 do
        rm -f "$d/$old"

-       if test -f "$d/$new"
-       then
-               ln -s "$new" "$d/$old" || exit
-       fi

 done <<\EOF
 git-add-script git-add
 git-archimport-script  git-archimport
 done <<\EOF
 git-add-script git-add
 git-archimport-script  git-archimport