[Jython-checkins] jython: Use relative path for jython -m ensurepip in installer. Fixes #2350

[jim.baker]

https://hg.python.org/jython/rev/b6735606c13d
changeset:   7886:b6735606c13d
user:        Jim Baker <jim.baker at rackspace.com>
date:        Mon Feb 01 20:34:32 2016 -0700
summary:
  Use relative path for jython -m ensurepip in installer. Fixes #2350

files:
  installer/src/java/org/python/util/install/JarInstaller.java |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/installer/src/java/org/python/util/install/JarInstaller.java b/installer/src/java/org/python/util/install/JarInstaller.java
--- a/installer/src/java/org/python/util/install/JarInstaller.java
+++ b/installer/src/java/org/python/util/install/JarInstaller.java
@@ -6,6 +6,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -179,9 +180,9 @@
     private int ensurepip(Path bindir) {
         int errorCode = 0;
         try {
-            String launcher = bindir.resolve("jython").toString();
             String command[] = new String[]{
-                    launcher, "-m", "ensurepip"};
+                    Paths.get(".", "jython").toString(),
+                    "-m", "ensurepip"};
             ChildProcess childProcess = new ChildProcess(command);
             childProcess.setCWD(bindir);
             errorCode = childProcess.run();

-- 
Repository URL: https://hg.python.org/jython