{"thread":{"id":"11044","subject":"[PATCH 1/2] Move all dashed-form commands to libexecdir","startedAt":"2007-11-28T16:21:57Z","lastAt":"2007-11-28T16:21:57Z","messageCount":1,"participants":["Nguyễn Thái Ngọc Duy"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"61232","messageId":"20071128162157.GA5386@laptop","threadId":"11044","inReplyTo":null,"subject":"[PATCH 1/2] Move all dashed-form commands to libexecdir","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2007-11-28T16:21:57Z","receivedAt":"2007-11-28T16:21:57Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\n---\n Third version. Changes include\n  - warn users if they have old commands in bindir\n  - update git.spec.in (I did not use, but rpm2targz output seemed\n    correct)\n\n Makefile      |    3 ++-\n check_bindir  |   13 +++++++++++++\n config.mak.in |    2 +-\n git.spec.in   |   13 +++++++------\n 4 files changed, 23 insertions(+), 8 deletions(-)\n create mode 100755 check_bindir\n\ndiff --git a/Makefile b/Makefile\nindex 313f9a2..3cf791f 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -154,7 +154,7 @@ STRIP ?= strip\n \n prefix = $(HOME)\n bindir = $(prefix)/bin\n-gitexecdir = $(bindir)\n+gitexecdir = $(prefix)/libexec/git-core\n sharedir = $(prefix)/share\n template_dir = $(sharedir)/git-core/templates\n ifeq ($(prefix),/usr)\n@@ -1034,6 +1034,7 @@ endif\n ifneq (,$X)\n \t$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p';)\n endif\n+\t./check_bindir 'z$(bindir_SQ)' 'z$(gitexecdir_SQ)' '$(DESTDIR_SQ)$(bindir_SQ)/git-shell$X'\n \n install-doc:\n \t$(MAKE) -C Documentation install\ndiff --git a/check_bindir b/check_bindir\nnew file mode 100755\nindex 0000000..a1c4c3e\n--- /dev/null\n+++ b/check_bindir\n@@ -0,0 +1,13 @@\n+#!/bin/sh\n+bindir=\"$1\"\n+gitexecdir=\"$2\"\n+gitcmd=\"$3\"\n+if test \"$bindir\" != \"$gitexecdir\" -a -x \"$gitcmd\"\n+then\n+\techo\n+\techo \"!! You have installed git-* commands to new gitexecdir.\"\n+\techo \"!! Old version git-* commands still remain in bindir.\"\n+\techo \"!! Mixing two versions of Git will lead to problems.\"\n+\techo \"!! Please remove old version commands in bindir now.\"\n+\techo\n+fi\ndiff --git a/config.mak.in b/config.mak.in\nindex 11d256e..1db0338 100644\n--- a/config.mak.in\n+++ b/config.mak.in\n@@ -11,7 +11,7 @@ TCLTK_PATH = @TCLTK_PATH@\n prefix = @prefix@\n exec_prefix = @exec_prefix@\n bindir = @bindir@\n-#gitexecdir = @libexecdir@/git-core/\n+gitexecdir = @libexecdir@/git-core/\n datarootdir = @datarootdir@\n template_dir = @datadir@/git-core/templates/\n \ndiff --git a/git.spec.in b/git.spec.in\nindex bdb293d..b6637a7 100644\n--- a/git.spec.in\n+++ b/git.spec.in\n@@ -105,6 +105,7 @@ find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'\n find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'\n \n (find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE \"archimport|svn|cvs|email|gitk|git-gui|git-citool\" | sed -e s@^$RPM_BUILD_ROOT@@)               > bin-man-doc-files\n+(find $RPM_BUILD_ROOT%{_libexecdir}/git-core -type f | grep -vE \"archimport|svn|cvs|email|gitk|git-gui|git-citool\" | sed -e s@^$RPM_BUILD_ROOT@@)               >> bin-man-doc-files\n (find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files\n %if %{!?_without_docs:1}0\n (find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE \"archimport|svn|git-cvs|email|gitk|git-gui|git-citool\" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files\n@@ -120,7 +121,7 @@ rm -rf $RPM_BUILD_ROOT\n \n %files svn\n %defattr(-,root,root)\n-%{_bindir}/*svn*\n+%{_libexecdir}/git-core/*svn*\n %doc Documentation/*svn*.txt\n %{!?_without_docs: %{_mandir}/man1/*svn*.1*}\n %{!?_without_docs: %doc Documentation/*svn*.html }\n@@ -128,28 +129,28 @@ rm -rf $RPM_BUILD_ROOT\n %files cvs\n %defattr(-,root,root)\n %doc Documentation/*git-cvs*.txt\n-%{_bindir}/*cvs*\n+%{_libexecdir}/git-core/*cvs*\n %{!?_without_docs: %{_mandir}/man1/*cvs*.1*}\n %{!?_without_docs: %doc Documentation/*git-cvs*.html }\n \n %files arch\n %defattr(-,root,root)\n %doc Documentation/git-archimport.txt\n-%{_bindir}/git-archimport\n+%{_libexecdir}/git-core/git-archimport\n %{!?_without_docs: %{_mandir}/man1/git-archimport.1*}\n %{!?_without_docs: %doc Documentation/git-archimport.html }\n \n %files email\n %defattr(-,root,root)\n %doc Documentation/*email*.txt\n-%{_bindir}/*email*\n+%{_libexecdir}/git-core/*email*\n %{!?_without_docs: %{_mandir}/man1/*email*.1*}\n %{!?_without_docs: %doc Documentation/*email*.html }\n \n %files gui\n %defattr(-,root,root)\n-%{_bindir}/git-gui\n-%{_bindir}/git-citool\n+%{_libexecdir}/git-core/git-gui\n+%{_libexecdir}/git-core/git-citool\n %{_datadir}/git-gui/\n %{!?_without_docs: %{_mandir}/man1/git-gui.1*}\n %{!?_without_docs: %doc Documentation/git-gui.html}\n-- \n1.5.3.6.2041.g106f-dirty\n"}]}