[PATCH 2/2] Link porcelain commands from gitexecdir to bindir

[PATCH 2/2] Link porcelain commands from gitexecdir to bindir

[Nguyễn Thái Ngọc Duy]

This also adds variable my_porcelains. If you are not happy
with the default porcelain list, you can add your favourite
commands too.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 The porcelain list needs eyeballs.

 Makefile    |   15 +++++++++++++++
 git.spec.in |    6 ++++++
 2 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index 3cf791f..0ab1569 100644
--- a/Makefile
+++ b/Makefile
@@ -262,6 +262,17 @@ BUILT_INS = \
 	git-fsck-objects$X git-cherry-pick$X git-status$X\
 	$(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))
 
+PORCELAINS = \
+	add$X am annotate$X apply$X archive$X bisect blame$X \
+	branch$X bundle$X checkout cherry-pick$X citool$X clean$X \
+	clone commit$X config$X cvsimport archimport \
+	daemon$X describe$X diff$X fetch$X format-patch$X fsck$X \
+	gc$X grep$X gui$X init$X instaweb log$X lost-found \
+	merge mergetool mv$X name-rev$X pull push$X quiltimport \
+	rebase remote rerere$X reset$X revert$X rm$X send-email \
+	show$X stash status submodule svn tag$X var$X \
+	whatchanged$X $(my_porcelains)
+
 # what 'all' will build and 'install' will install, in gitexecdir
 ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)
 
@@ -1034,6 +1045,10 @@ endif
 ifneq (,$X)
 	$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p';)
 endif
+	if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \
+	then \
+		$(foreach p,$(PORCELAINS), ln -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-$p' '$(DESTDIR_SQ)$(bindir_SQ)/git-$p' || cp '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-$p' '$(DESTDIR_SQ)$(bindir_SQ)/git-$p';) \
+	fi
 	./check_bindir 'z$(bindir_SQ)' 'z$(gitexecdir_SQ)' '$(DESTDIR_SQ)$(bindir_SQ)/git-shell$X'
 
 install-doc:
diff --git a/git.spec.in b/git.spec.in
index b6637a7..6830b03 100644
--- a/git.spec.in
+++ b/git.spec.in
@@ -121,6 +121,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files svn
 %defattr(-,root,root)
+%{_bindir}/*svn*
 %{_libexecdir}/git-core/*svn*
 %doc Documentation/*svn*.txt
 %{!?_without_docs: %{_mandir}/man1/*svn*.1*}
@@ -129,6 +130,7 @@ rm -rf $RPM_BUILD_ROOT
 %files cvs
 %defattr(-,root,root)
 %doc Documentation/*git-cvs*.txt
+%{_bindir}/*cvs*
 %{_libexecdir}/git-core/*cvs*
 %{!?_without_docs: %{_mandir}/man1/*cvs*.1*}
 %{!?_without_docs: %doc Documentation/*git-cvs*.html }
@@ -136,6 +138,7 @@ rm -rf $RPM_BUILD_ROOT
 %files arch
 %defattr(-,root,root)
 %doc Documentation/git-archimport.txt
+%{_bindir}/git-archimport
 %{_libexecdir}/git-core/git-archimport
 %{!?_without_docs: %{_mandir}/man1/git-archimport.1*}
 %{!?_without_docs: %doc Documentation/git-archimport.html }
@@ -143,13 +146,16 @@ rm -rf $RPM_BUILD_ROOT
 %files email
 %defattr(-,root,root)
 %doc Documentation/*email*.txt
+%{_bindir}/*email*
 %{_libexecdir}/git-core/*email*
 %{!?_without_docs: %{_mandir}/man1/*email*.1*}
 %{!?_without_docs: %doc Documentation/*email*.html }
 
 %files gui
 %defattr(-,root,root)
+%{_bindir}/git-gui
 %{_libexecdir}/git-core/git-gui
+%{_bindir}/git-citool
 %{_libexecdir}/git-core/git-citool
 %{_datadir}/git-gui/
 %{!?_without_docs: %{_mandir}/man1/git-gui.1*}
-- 
1.5.3.6.2041.g106f-dirty

Re: [PATCH 2/2] Link porcelain commands from gitexecdir to bindir

[Junio C Hamano]

Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:

>  The porcelain list needs eyeballs.

The source of porcelain list needs consolidation first.  See a patch
from me in the last couple of days to contrib/completion and
generate-cmdlist.sh for ideas, for example.