From 259480fc8ee4c040f10d2c5bb72e5e5c2bd753af Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junkio@cox.net>
Date: Mon, 26 Dec 2005 01:45:32 -0800
Subject: [PATCH] Do more and more things on kernel.org

---
 Distrib     | 28 ----------------------------
 DoKernelOrg | 38 ++++++++++++++++++++++++++------------
 2 files changed, 26 insertions(+), 40 deletions(-)
 delete mode 100755 Distrib

diff --git a/Distrib b/Distrib
deleted file mode 100755
index 2d927931..00000000
--- a/Distrib
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# This is not for general consumption but just a simple script
-# I use on my private development environment and on kernel.org
-# machine to cut binary distribution material.
-
-V=${1?'version'}
-M=master.kernel.org
-case `hostname` in
-siamese)
-	scp $0 ${M}:./Distrib
-	cd /chroot/sarge/build/git &&
-	scp git-*_$V[-.]* git-$V.tar.gz ${M}:debian/.
-	exit
-	;;
-esac
-
-G=/pub/software/scm/git
-D=$G/debian
-
-set -x
-
-mkdir -p $G/RPMS/i386 $G/RPMS/SRPMS
-
-ln $HOME/debian/git-*_$V[-.]* $D/.
-ln $HOME/debian/git-$V.tar.gz $G/.
-ln $HOME/rpms/RPMS/i386/git*-$V-* $G/RPMS/i386/.
-ln $HOME/rpms/SRPMS/git-$V-* $G/RPMS/SRPMS/.
diff --git a/DoKernelOrg b/DoKernelOrg
index 54fae2e2..80457f4e 100755
--- a/DoKernelOrg
+++ b/DoKernelOrg
@@ -1,32 +1,46 @@
 #!/bin/sh
 
+J=
+# J='-l 4 -j'
+nodo=echo
+
 cd $HOME/git &&
 make clean &&
 git reset --hard &&
 make clean &&
 git checkout master &&
 git pull . origin &&
-make clean test doc install &&
-make clean
-git checkout pu &&
-make test clean &&
+make clean &&
+
 case "$1" in
+'')
+	make $J install &&
+	make test &&
+	make clean &&
+	git checkout pu &&
+	make $J clean &&
+	make test clean
+	;;
 maint | master)
+	G=/pub/software/scm/git &&
+
 	git checkout "$1" &&
 	make rpm &&
-	cp git-*.tar.gz $HOME/tarpit/ &&
-	make clean &&
-	make git doc &&
+	make $J git &&
 	V=$(./git --version | sed -e 's/git version //') &&
+	$nodo ln git-$V.tar.gz $G/. &&
 	D=`pwd` &&
 	M="git-man-pages-$V" &&
 	rm -rf "$M" &&
 	rm -f "$M".tar.gz &&
-	./Make man1="$D/$M/man1" man7="$D/$M/man7" -C Documentation install &&
-	tar zcf "$HOME/tarpit/$M".tar.gz "$M" &&
+	make man1="$D/$M/man1" man7="$D/$M/man7" -C Documentation install &&
+	$nodo tar zcf "$G/$M".tar.gz "$M" &&
 	rm -fr "$M" &&
-	make clean ||
-	exit $?
+	make clean &&
+
+	$nodo ln $HOME/rpms/RPMS/i386/git*-$V-* $G/RPMS/i386/. &&
+	$nodo ln $HOME/rpms/SRPMS/git-$V-* $G/RPMS/SRPMS/.
 	;;
-esac
+esac || exit $?
+
 git checkout master
-- 
2.11.0