mirror of
https://github.com/GNS3/gns3-server
synced 2024-11-12 19:38:57 +00:00
Update paths for binaries moved to the MacOS directory in GNS3.app
This commit is contained in:
parent
69ba0ccf77
commit
4c83fc1243
@ -100,10 +100,10 @@ class Qemu(BaseManager):
|
||||
paths.update(["/usr/bin", "/usr/local/bin", "/opt/local/bin"])
|
||||
try:
|
||||
exec_dir = os.path.dirname(os.path.abspath(sys.executable))
|
||||
paths.add(os.path.abspath(os.path.join(exec_dir, "../Resources/qemu/bin/")))
|
||||
paths.add(os.path.abspath(os.path.join(exec_dir, "qemu/bin")))
|
||||
# If the user run the server by hand from outside
|
||||
except FileNotFoundError:
|
||||
paths.add("/Applications/GNS3.app/Contents/Resources/qemu/bin")
|
||||
paths.add("/Applications/GNS3.app/Contents/MacOS/qemu/bin")
|
||||
return paths
|
||||
|
||||
@staticmethod
|
||||
|
@ -23,7 +23,7 @@
|
||||
# or negative for a release candidate or beta (after the base version
|
||||
# number has been incremented)
|
||||
|
||||
__version__ = "2.2.0dev2"
|
||||
__version__ = "2.2.0dev6"
|
||||
__version_info__ = (2, 2, 0, 99)
|
||||
|
||||
# If it's a git checkout try to add the commit
|
||||
|
Loading…
Reference in New Issue
Block a user