srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

artiq_flash: fix openocd scripts path (#513)

This commit is contained in:
Robert Jördens 2016-07-15 15:31:27 +02:00
parent ce73e8eea7
commit 25a9d345d9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
artiq/frontend/artiq_flash.py
View File

@ -5,7 +5,7 @@ import argparse
import os import os
import subprocess import subprocess
import tempfile import tempfile
import site import shutil
from artiq import __artiq_dir__ as artiq_dir from artiq import __artiq_dir__ as artiq_dir
from artiq.frontend.bit2bin import bit2bin from artiq.frontend.bit2bin import bit2bin
@ -77,11 +77,12 @@ def main():
raise SystemExit("Binaries directory '{}' does not exist" raise SystemExit("Binaries directory '{}' does not exist"
.format(opts.dir)) .format(opts.dir))
conda_prefix_path = site.getsitepackages()[0] scripts_path = ["share", "openocd", "scripts"]
if os.name == "nt": if os.name == "nt":
scripts_path = os.path.join(conda_prefix_path, "Library", "share", "openocd", "scripts") scripts_path.insert(0, "Library")
else: scripts_path = os.path.abspath(os.path.join(
scripts_path = os.path.join(conda_prefix_path, "share", "openocd", "scripts") os.path.dirname(shutil.which("openocd")),
"..", *scripts_path))
conv = False conv = False