From 53a57300cc3e322d9e10ce30ad03a8b00d7a0009 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sat, 23 Nov 2019 21:31:29 +0000 Subject: Fixed which statement. It's a builtin and not a /usr/bin command --- archinstall.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'archinstall.py') diff --git a/archinstall.py b/archinstall.py index 2b3cc302..783db347 100644 --- a/archinstall.py +++ b/archinstall.py @@ -7,7 +7,7 @@ from glob import glob from select import epoll, EPOLLIN, EPOLLHUP from socket import socket, inet_ntoa, AF_INET, AF_INET6, AF_PACKET from collections import OrderedDict as oDict -from subprocess import Popen, STDOUT, PIPE +from subprocess import Popen, STDOUT, PIPE, check_output from random import choice from string import ascii_uppercase, ascii_lowercase, digits from hashlib import sha512 @@ -235,9 +235,10 @@ class sys_command():#Thread): if not self.cmd[0][0] == '/': log('Worker command is not executed with absolute path, trying to find: {}'.format(self.cmd[0]), origin='spawn', level=5) - o = sys_command('/usr/bin/which {}'.format(self.cmd[0]), emulate=False, hide_from_log=True) + o = check_output(['which', self.cmd[0]]) + ##o = sys_command('sh which {}'.format(self.cmd[0]), emulate=False, hide_from_log=True) log('This is the binary {} for {}'.format(o.decode('UTF-8'), self.cmd[0]), origin='spawn', level=5) - self.cmd[0] = o.decode('UTF-8') + self.cmd[0] = o.decode('UTF-8').strip() if not os.path.isdir(self.exec_dir): os.makedirs(self.exec_dir) -- cgit v1.2.3-70-g09d2