From db565f2335c2d8b2791215579dc616bc771acc49 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Tue, 20 Aug 2013 10:43:10 +0100
Subject: Make the author-map work without relative paths (like b2585bb)

---
 scripts/mageia-import.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/scripts/mageia-import.sh b/scripts/mageia-import.sh
index 048ea63..1206b79 100755
--- a/scripts/mageia-import.sh
+++ b/scripts/mageia-import.sh
@@ -11,12 +11,18 @@ fi
 BASESOFTWARE=$(basename $SOFTWARE)
 
 if [ -d $BASESOFTWARE-origin ]; then
-  echo "It seems the svn-git repository already exists ($BASESOFTWARE-origin)"
+  echo "It seems the svn-git repository already exists ($BASESOFTWARE-origin)" >&2
   exit 1
 fi
 
 if [ -d $BASESOFTWARE.git ]; then
-  echo "It seems the converted git repository already exists ($BASESOFTWARE.git)"
+  echo "It seems the converted git repository already exists ($BASESOFTWARE.git)" >&2
+  exit 1
+fi
+
+AUTHORMAP=$(realpath $(dirname $(realpath $0))/../metadata/mageia-user-map.txt)
+if [ ! -f "$AUTHORMAP" ]; then
+  echo "Cannot find author map." >&2
   exit 1
 fi
 
@@ -41,11 +47,11 @@ cd $BASESOFTWARE-origin
 revision=0
 if [ -n "$skiprevisions" ]; then
   for rev in $skiprevisions; do
-    git svn fetch -A ../authors-transform.txt -r $(( $revision + 1 )):$(( $rev - 1 ))
+    git svn fetch -A $AUTHORMAP -r $(( $revision + 1 )):$(( $rev - 1 ))
     revision=$rev
   done
 fi
-git svn fetch -A ../authors-transform.txt -r $(( $revision + 1 )):HEAD
+git svn fetch -A $AUTHORMAP -r $(( $revision + 1 )):HEAD
 git reset --hard trunk
 echo
 echo "done"
-- 
cgit v1.2.1