From 5be60078c935ed08ee8eb5a32680bdfb6bb5bdf3 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 2 Jul 2007 22:52:14 -0700 Subject: Rewrite "git-frotz" to "git frotz" This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano --- Documentation/install-doc-quick.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Documentation/install-doc-quick.sh') diff --git a/Documentation/install-doc-quick.sh b/Documentation/install-doc-quick.sh index a64054948a..e6601bdd82 100755 --- a/Documentation/install-doc-quick.sh +++ b/Documentation/install-doc-quick.sh @@ -10,7 +10,7 @@ USAGE=' ' export GIT_DIR test -z "$mandir" && usage -if ! git-rev-parse --verify "$head^0" >/dev/null; then +if ! git rev-parse --verify "$head^0" >/dev/null; then echo >&2 "head: $head does not exist in the current repository" usage fi @@ -18,12 +18,12 @@ fi GIT_INDEX_FILE=`pwd`/.quick-doc.index export GIT_INDEX_FILE rm -f "$GIT_INDEX_FILE" -git-read-tree $head -git-checkout-index -a -f --prefix="$mandir"/ +git read-tree $head +git checkout-index -a -f --prefix="$mandir"/ if test -n "$GZ"; then cd "$mandir" - for i in `git-ls-tree -r --name-only $head` + for i in `git ls-tree -r --name-only $head` do gzip < $i > $i.gz && rm $i done -- cgit v1.2.3 From 00d8c5180dde7434930bfbdf20bc296e9241e4fc Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 4 Aug 2007 23:48:27 -0700 Subject: Fix install-doc-quick target The script starts in a subdirectory of the source directory to muck with a branch whose structure does not have anything to do with the actual work tree. Go up to the top to make it clear that we operate on the whole tree. It also exported GIT_DIR without any good reason. Remove it. Signed-off-by: Junio C Hamano --- Documentation/install-doc-quick.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Documentation/install-doc-quick.sh') diff --git a/Documentation/install-doc-quick.sh b/Documentation/install-doc-quick.sh index e6601bdd82..07d227f093 100755 --- a/Documentation/install-doc-quick.sh +++ b/Documentation/install-doc-quick.sh @@ -7,7 +7,7 @@ mandir="$2" SUBDIRECTORY_OK=t USAGE=' ' . git-sh-setup -export GIT_DIR +cd_to_toplevel test -z "$mandir" && usage if ! git rev-parse --verify "$head^0" >/dev/null; then @@ -18,6 +18,8 @@ fi GIT_INDEX_FILE=`pwd`/.quick-doc.index export GIT_INDEX_FILE rm -f "$GIT_INDEX_FILE" +trap 'rm -f "$GIT_INDEX_FILE"' 0 + git read-tree $head git checkout-index -a -f --prefix="$mandir"/ -- cgit v1.2.3 From 87027ae4494cd09c428e85b85337fed45a42e29c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 6 Aug 2007 21:15:15 -0700 Subject: Fix "make GZ=1 quick-install-doc" The basic idea is from Mark Levedahl. I do not use GZ=1 nor quick-install-doc myself (there obviously is a chicken-and-egg issue with quick-install-doc for me). Signed-off-by: Junio C Hamano --- Documentation/install-doc-quick.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'Documentation/install-doc-quick.sh') diff --git a/Documentation/install-doc-quick.sh b/Documentation/install-doc-quick.sh index 07d227f093..5433cf8ced 100755 --- a/Documentation/install-doc-quick.sh +++ b/Documentation/install-doc-quick.sh @@ -24,10 +24,8 @@ git read-tree $head git checkout-index -a -f --prefix="$mandir"/ if test -n "$GZ"; then - cd "$mandir" - for i in `git ls-tree -r --name-only $head` - do - gzip < $i > $i.gz && rm $i - done + git ls-tree -r --name-only $head | + xargs printf "$mandir/%s\n" | + xargs gzip -f fi rm -f "$GIT_INDEX_FILE" -- cgit v1.2.3 From dc0f70541503e9006ac2fe812591b080c169c572 Mon Sep 17 00:00:00 2001 From: Mark Levedahl Date: Mon, 7 Jul 2008 22:37:38 -0400 Subject: install-doc-quick - use git --exec-path to find git-sh-setup This is needed as git-sh-setup is no longer in the path. Signed-off-by: Mark Levedahl Signed-off-by: Junio C Hamano --- Documentation/install-doc-quick.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/install-doc-quick.sh') diff --git a/Documentation/install-doc-quick.sh b/Documentation/install-doc-quick.sh index 5433cf8ced..35f440876e 100755 --- a/Documentation/install-doc-quick.sh +++ b/Documentation/install-doc-quick.sh @@ -6,7 +6,7 @@ head="$1" mandir="$2" SUBDIRECTORY_OK=t USAGE=' ' -. git-sh-setup +. "$(git --exec-path)"/git-sh-setup cd_to_toplevel test -z "$mandir" && usage -- cgit v1.2.3