jab2870/PappyProxy
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

pap.py: Try to locate puppy in /usr/lib/go/ if GOPATH is not set

Browse source
This commit is contained in:
Jan Holthuis 2018-11-20 07:49:53 +01:00
parent e1bb049ef0
commit d26b96dcc5
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
pappyproxy/pap.py
View file

@ -74,15 +74,20 @@ def main():
msg_addr = args.dbgattach[0] msg_addr = args.dbgattach[0]
else: else:
msg_addr = None msg_addr = None
try:
binpaths = [
# Try to get the binary from GOPATH # Try to get the binary from GOPATH
gopath = os.environ["GOPATH"] os.path.join(os.getenv('GOPATH', '/usr/lib/go'), 'bin'),
binloc = os.path.join(gopath, "bin", "puppy")
except:
# Try to get the binary from ~/.pappy/puppy # Try to get the binary from ~/.pappy/puppy
binloc = os.path.join(data_dir, "puppy") data_dir,
if not os.path.exists(binloc): ]
print("Could not find puppy binary in GOPATH or ~/.pappy. Please ensure that it has been compiled, or pass in the binary location from the command line")
for binpath in binpaths:
binloc = os.path.join(binpath, 'puppy')
if os.path.exists(binloc):
break
else:
print('Could not find puppy binary in GOPATH or ~/.pappy. Please ensure that it has been compiled, or pass in the binary location from the command line')
exit(1) exit(1)
config = ProxyConfig() config = ProxyConfig()
if not args.lite: if not args.lite: