Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 21:44:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Teach fish_config how to find fish from __fish_bin_dir

Browse source 
Fixes https://github.com/fish-shell/fish-shell/issues/621
This commit is contained in:
ridiculousfish 2013-04-15 14:15:47 -07:00
parent bcf3accb74
commit 2517832718
1 changed files with 42 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
share/tools/web_config/webconfig.py
View file

@ -1,7 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
# Whether we're Python 2 # Whether we're Python 2
import sys import sys, os
IS_PY2 = sys.version_info[0] == 2 IS_PY2 = sys.version_info[0] == 2
if IS_PY2: if IS_PY2:
@ -23,9 +23,10 @@ try:
except ImportError: except ImportError:
import simplejson as json import simplejson as json
FISH_BIN_PATH = False # will be set later
def run_fish_cmd(text): def run_fish_cmd(text):
from subprocess import PIPE from subprocess import PIPE
p = subprocess.Popen(["fish"], stdin=PIPE, stdout=PIPE, stderr=PIPE) p = subprocess.Popen([FISH_BIN_PATH], stdin=PIPE, stdout=PIPE, stderr=PIPE)
if IS_PY2: if IS_PY2:
out, err = p.communicate(text) out, err = p.communicate(text)
else: else:
@ -573,6 +574,32 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
def log_request(self, code='-', size='-'): def log_request(self, code='-', size='-'):
""" Disable request logging """ """ Disable request logging """
pass pass
# find fish
fish_bin_dir = os.environ.get('__fish_bin_dir')
fish_bin_path = None
if not fish_bin_dir:
print('The __fish_bin_dir environment variable is not set. Looking in $PATH...')
# distutils.spawn is terribly broken, because it looks in wd before PATH,
# and doesn't actually validate that the file is even executabl
for p in os.environ['PATH'].split(os.pathsep):
proposed_path = os.path.join(p, 'fish')
if os.access(proposed_path, os.X_OK):
fish_bin_path = proposed_path
break
if not fish_bin_path:
print("fish could not be found. Is fish installed correctly?")
sys.exit(-1)
else:
print("fish found at '%s'" % fish_bin_path)
else:
fish_bin_path = os.path.join(fish_bin_dir, 'fish')
if not os.access(fish_bin_path, os.X_OK):
print("fish could not be executed at path '%s'. Is fish installed correctly?" % fish_bin_path)
sys.exit(-1)
FISH_BIN_PATH = fish_bin_path
# We want to show the demo prompts in the directory from which this was invoked, # We want to show the demo prompts in the directory from which this was invoked,
# so get the current working directory # so get the current working directory
@ -618,12 +645,16 @@ webbrowser.open(url)
# Select on stdin and httpd # Select on stdin and httpd
stdin_no = sys.stdin.fileno() stdin_no = sys.stdin.fileno()
while True: try:
ready_read = select.select([sys.stdin.fileno(), httpd.fileno()], [], []) while True:
if ready_read[0][0] < 1: ready_read = select.select([sys.stdin.fileno(), httpd.fileno()], [], [])
print("Shutting down.") if ready_read[0][0] < 1:
# Consume the newline so it doesn't get printed by the caller print("Shutting down.")
sys.stdin.readline() # Consume the newline so it doesn't get printed by the caller
break sys.stdin.readline()
else: break
httpd.handle_request() else:
httpd.handle_request()
except KeyboardInterrupt:
print("\nShutting down.")