Removed the use of the PATH environment variable

nylen · May 17, 2015 · 4b5b54d · 4b5b54d
1 parent 6d3aca9
commit 4b5b54d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/cygapt/cygapt.py b/src/cygapt/cygapt.py
@@ -678,7 +678,7 @@ def _runScript(self, file_name, optional=True):
             sys.stderr.write("running: {0}\n".format(file_name));
             if self.__cygwinPlatform:
                 cmd = " ".join([
-                    "bash",
+                    "/bin/bash",
                     self.SH_OPTIONS,
                     mapped_file
                 ]);
@@ -693,7 +693,7 @@ def _runScript(self, file_name, optional=True):
             extension = os.path.splitext(mapped_file)[1];
 
             if ".dash" == extension :
-                cmd = ["dash", self.DASH_OPTIONS, mapped_file];
+                cmd = ["/bin/dash", self.DASH_OPTIONS, mapped_file];
                 if not self.__cygwinPlatform:
                     cmd[0] = self.__dosDash;
                 cmd = " ".join(cmd);

diff --git a/src/cygapt/setup.py b/src/cygapt/setup.py
@@ -373,7 +373,7 @@ def update(self, cyg_apt_rc, verify, main_mirror=None):
                 raise RequestException(msg, previous=e);
 
             if self.__cygwinPlatform:
-                gpg_path = "gpg ";
+                gpg_path = "/usr/bin/gpg ";
             else:
                 if self._cygwinVersion() < 1.7:
                     gpg_path = "/usr/bin/gpg ";
@@ -477,7 +477,7 @@ def _gpgImport(self, uri):
 
         cautils.uri_get(self.__tmpDir, uri, verbose=self.__verbose);
         tmpfile = os.path.join(self.__tmpDir, os.path.basename(uri));
-        cmd = "gpg ";
+        cmd = "/usr/bin/gpg ";
         cmd += "--no-secmem-warning ";
         cmd += "--import {0}".format(tmpfile);
         Process(cmd).mustRun();

diff --git a/src/cygapt/utils.py b/src/cygapt/utils.py
@@ -32,7 +32,7 @@
 from cygapt.process import Process;
 
 def cygpath(path):
-    p = Process("cygpath \"{0}\"".format(path));
+    p = Process("/bin/cygpath \"{0}\"".format(path));
     p.run();
     dospath = p.getOutput().strip();
     return dospath;