From 9f613899512e2091d2699c7f64b60c0dbdad71a2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 28 Dec 2012 12:10:13 -0400
Subject: move VCS probing to after we know what ETCKEEPER_DIR is

CWD does not have to be /etc when using etckeeper..
---
 etckeeper | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/etckeeper b/etckeeper
index bbdecff..cb180b6 100755
--- a/etckeeper
+++ b/etckeeper
@@ -16,22 +16,6 @@ if [ -e $conf ]; then
 	. $conf
 fi
 
-if [ -d ".git" ]; then
-	VCS=git
-elif [ -d ".hg" ]; then
-	VCS=hg
-elif [ -d "_darcs" ]; then
-	VCS=darcs
-elif [ -d ".bzr" ]; then
-	VCS=bzr
-fi
-
-if [ -z "$VCS" ]; then
-	echo "Please configure a VCS in $conf" >&2
-	exit 1
-fi
-export VCS
-
 unset GIT_WORK_TREE
 unset GIT_DIR
 
@@ -107,6 +91,22 @@ fi
 cd "$ETCKEEPER_DIR"
 export ETCKEEPER_DIR
 
+if [ -d ".git" ]; then
+	VCS=git
+elif [ -d ".hg" ]; then
+	VCS=hg
+elif [ -d "_darcs" ]; then
+	VCS=darcs
+elif [ -d ".bzr" ]; then
+	VCS=bzr
+fi
+
+if [ -z "$VCS" ]; then
+	echo "Please configure a VCS in $conf" >&2
+	exit 1
+fi
+export VCS
+
 lsscripts() {
 	perl -e '
 		$dir=shift;
-- 
cgit v1.2.3