Skip to content

Commit

Permalink
Merge pull request #20 from fr0zn/macos
Browse files Browse the repository at this point in the history
Adding support for MacOS
  • Loading branch information
nongiach authored Aug 19, 2018
2 parents 7251c24 + e3fee56 commit ad41778
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 6 deletions.
15 changes: 11 additions & 4 deletions arm_now/arm_now.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def run_qemu(arch, kernel, dtb, rootfs, add_qemu_options):
options = qemu_options[arch][1].format(arch=arch, kernel=kernel, rootfs=rootfs, dtb=dtb)
arch = qemu_options[arch][0]
print("Starting qemu-system-{}".format(arch))
qemu_config = "-serial stdio -monitor /dev/null {add_qemu_options}".format(add_qemu_options=add_qemu_options)
qemu_config = "-serial stdio -monitor null {add_qemu_options}".format(add_qemu_options=add_qemu_options)
cmd = """stty intr ^]
export QEMU_AUDIO_DRV="none"
qemu-system-{arch} {options} \
Expand Down Expand Up @@ -230,12 +230,19 @@ def config_filesystem(rootfs, arch, real_source):

def check_dependencies_or_exit():
dependencies = [
which("e2cp", ubuntu="apt-get install e2tools", arch="yaourt -S e2tools"),
which("e2cp",
ubuntu="apt-get install e2tools",
arch="yaourt -S e2tools",
darwin="brew install e2tools gettext e2fsprogs\nbrew unlink e2fsprogs && brew link e2fsprogs -f"),
which("qemu-system-arm",
ubuntu="apt-get install qemu",
kali="apt-get install qemu-system",
arch="pacman -S qemu-arch-extra"),
which("unzip", ubuntu="apt-get install unzip", arch="pacman -S unzip")
arch="pacman -S qemu-arch-extra",
darwin="brew install qemu"),
which("unzip",
ubuntu="apt-get install unzip",
arch="pacman -S unzip",
darwin="brew install unzip")
]
if not all(dependencies):
print("requirements missing, plz install them", file=sys.stderr)
Expand Down
6 changes: 4 additions & 2 deletions arm_now/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@ def pcolor(color, *args, **kwargs):

@functools.lru_cache()
def distribution():
return platform.linux_distribution()[0].lower()

system = platform.system().lower()
if system != 'darwin':
return platform.linux_distribution()[0].lower()
return system

def which(filename, **kwargs):
try:
Expand Down

0 comments on commit ad41778

Please sign in to comment.