From 72dbb832d942fab7b8e59a3561ad3842fea96025 Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Tue, 7 Mar 2017 20:34:31 +0100
Subject: [PATCH] Fix maven repo access again.

---
 .travis.yml                             | 2 +-
 jipconf_subst.py => ci/jipconf_subst.py | 3 ++-
 tox.ini                                 | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename jipconf_subst.py => ci/jipconf_subst.py (86%)

diff --git a/.travis.yml b/.travis.yml
index 5f5db34..c81e42a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ before_install:
 
 install:
   - if [ "$JDBC_DRIVER" == "org.jaydebeapi:mockdriver:1.0-SNAPSHOT" ]; then (cd mockdriver && mvn -Dmaven.repo.local=$VIRTUAL_ENV/.m2/repository install) ;fi
-  - if [ -n "$JDBC_DRIVER" ]; then python jipconf_subst.py $VIRTUAL_ENV && pip install jip==0.9.3 && jip install $JDBC_DRIVER && export CLASSPATH=$VIRTUAL_ENV/javalib/* ;fi # TODO: Fix jip to search for local maven repo without twaking .jip
+  - if [ -n "$JDBC_DRIVER" ]; then python ci/jipconf_subst.py $VIRTUAL_ENV $VIRTUAL_ENV && pip install jip==0.9.3 && jip install $JDBC_DRIVER && export CLASSPATH=$VIRTUAL_ENV/javalib/* ;fi # TODO: Fix jip to search for local maven repo without twaking .jip
   - source $HOME/myvirtualenv/bin/activate
   - pip install -e .
   - if [ -z "$JYTHON" ]; then pip install coveralls ;fi
diff --git a/jipconf_subst.py b/ci/jipconf_subst.py
similarity index 86%
rename from jipconf_subst.py
rename to ci/jipconf_subst.py
index b3621ba..f7caaa7 100644
--- a/jipconf_subst.py
+++ b/ci/jipconf_subst.py
@@ -4,6 +4,7 @@ from os import path
 import sys
 
 home=sys.argv[1]
+dist=sys.argv[2]
 with open(path.join(home, '.jip'), "w") as out:
     print("""[repos:local]
 uri={0}/.m2/repository/
@@ -12,4 +13,4 @@ type=local
 [repos:central]
 uri=http://repo1.maven.org/maven2/
 type=remote
-""".format(home), file=out)
+""".format(dist), file=out)
diff --git a/tox.ini b/tox.ini
index a5d8b67..f66ef64 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ deps =
   jip==0.9.3
 commands =
 # Should be changed to {toxinidir} once i manage to download javalibs in tox
-  python jipconf_subst.py {distdir}
+  python ci/jipconf_subst.py {envdir} {distdir}
   driver-hsqldb:  jip install org.hsqldb:hsqldb:1.8.0.10
   driver-sqliteXerial:  jip install org.xerial:sqlite-jdbc:3.7.2
   driver-mock: mvn -Dmaven.repo.local={distdir}/.m2/repository -f mockdriver/pom.xml install