From a1d636add7209cdd1fad68954129c87e14fbbaff Mon Sep 17 00:00:00 2001
From: Petr Baudis <pasky@ucw.cz>
Date: Fri, 22 Jan 2010 01:09:13 +0100
Subject: [PATCH] darcs-fast-export: Put in basedir/bin/ during installation,
 call it from there

---
 install.sh     | 9 +++++++++
 jobd/update.sh | 2 +-
 taskd/clone.sh | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index 26eb413..160d380 100755
--- a/install.sh
+++ b/install.sh
@@ -96,6 +96,15 @@ cfg_browsercgi_url="$cfg_webadmurl/git-browser.cgi"
 EOT
 
 
+echo "*** Setting up darcs-fast-export from bzr-fastimport.git..."
+if [ ! -d bzr-fastimport.git/exporters/darcs/ ]; then
+	echo "ERROR: bzr-fastimport.git is not checked out! Did you _REALLY_ read INSTALL?" >&2
+	exit 1;
+fi
+mkdir -p "$cfg_basedir"/bin
+cp bzr-fastimport.git/exporters/darcs/darcs-fast-export "$cfg_basedir"/bin
+
+
 echo "*** Setting up our part of the website..."
 mkdir -p "$cfg_webroot" "$cfg_cgiroot"
 cp cgi/*.cgi gitweb/gitweb_config.perl "$cfg_cgiroot"
diff --git a/jobd/update.sh b/jobd/update.sh
index 1dd5e57..4e459a9 100755
--- a/jobd/update.sh
+++ b/jobd/update.sh
@@ -4,7 +4,7 @@
 
 # fast-import with error handling
 git_darcs_fetch() {
-	darcs-fast-export --export-marks=$(pwd)/dfe-marks --import-marks=$(pwd)/dfe-marks "$1" | \
+	"$cfg_basedir"/bin/darcs-fast-export --export-marks=$(pwd)/dfe-marks --import-marks=$(pwd)/dfe-marks "$1" | \
 		git fast-import --export-marks=$(pwd)/gfi-marks --import-marks=$(pwd)/gfi-marks
 	[ $PIPESTATUS[0] = 0 -a $PIPESTATUS[1] = 0 ]
 	return $?
diff --git a/taskd/clone.sh b/taskd/clone.sh
index 13b943a..727cb4e 100755
--- a/taskd/clone.sh
+++ b/taskd/clone.sh
@@ -34,7 +34,7 @@ case "$url" in
 		;;
 	darcs://*)
 		httpurl="${url/darcs:\/\//http:\/\/}"
-		darcs-fast-export --export-marks=$(pwd)/dfe-marks "$httpurl" | \
+		"$cfg_basedir"/bin/darcs-fast-export --export-marks=$(pwd)/dfe-marks "$httpurl" | \
 			git fast-import --export-marks=$(pwd)/gfi-marks
 		;;
 	*)
-- 
2.11.4.GIT