Make the author-map work without relative paths.

1 files changed, 10 insertions, 4 deletions

diff --git a/scripts/mageia-reset-and-import.sh b/scripts/mageia-reset-and-import.sh
index 5351ae1..50d2a91 100755
--- a/scripts/mageia-reset-and-import.sh
+++ b/scripts/mageia-reset-and-import.sh
@@ -14,7 +14,13 @@ if [ -z "$SOFTWARE" ]; then
 fi
 
 if [ -d ../$SOFTWARE.git ]; then
-  echo "It seems the converted git repository already exists (../$SOFTWARE.git)"
+  echo "It seems the converted git repository already exists (../$SOFTWARE.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
 
@@ -313,7 +319,7 @@ fi
 echo "Continuing svn fetch"
 if [ -n "$morerevisions" ]; then
   for rev in $morerevisions; 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
@@ -322,12 +328,12 @@ fi
 # should really check for....
 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"