Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/cygapt/cygapt.py
Original file line number Diff line number Diff line change
Expand Up @@ -677,15 +677,15 @@ def _runScript(self, file_name, optional=True):
mapped_file_done = mapped_file + ".done";
if os.path.isfile(mapped_file):
sys.stderr.write("running: {0}\n".format(file_name));
cmd = ["bash"] + self.SH_OPTIONS + [mapped_file];
cmd = ["/bin/bash"] + self.SH_OPTIONS + [mapped_file];
if not self.__cygwinPlatform:
cmd[0] = self.__dosBash;

cwd = None;
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;

Expand Down
4 changes: 2 additions & 2 deletions src/cygapt/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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.append("--no-secmem-warning");
cmd += ["--import", tmpfile];
Process(cmd).mustRun();
Expand Down
2 changes: 1 addition & 1 deletion src/cygapt/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
from cygapt.process import Process;

def cygpath(path):
p = Process(["cygpath", path]);
p = Process(["/bin/cygpath", path]);
p.run();
dospath = p.getOutput().strip();
return dospath;
Expand Down