From 956b7cca7e61c79b5bb11f4ef08055a3520aa96e Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Thu, 31 May 2018 00:51:52 +0200
Subject: [PATCH 01/34] Migrate from clize to docopt

---
 arm_now/arm_now.py | 93 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 77 insertions(+), 16 deletions(-)

diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index 90a9c8d..5bd24da 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -1,6 +1,55 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
+#  ================ Start Argument Parsing ==============================
+"""arm_now.
+Usage:
+  arm_now list [--all]
+  arm_now start [arch] [--clean] [--sync] [--offline] [--redir=<port>]...
+  arm_now clean
+  arm_now resize <new_size> [--correct]
+  arm_now install [arch] [--clean]
+  arm_now -h | --help
+  arm_now --version
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Commands:
+  list          List all available images for all cpu.
+  start         Start a vm with a <arch> cpu. (default: armv5-eabi)
+  resize        Resize the current rootfs. (example: resize 1G)
+  clean         Delete the current rootfs.
+  install       Install and config a rootfs for the given <arch>. (default: armv5-eabi)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Options:
+  --sync                        Synchronize the current directory with the vm home.
+  --redir protocol:host::guest  Redirect the host port to the guest (example: --redir tcp:8000::80)
+  --clean                       Clean the current image before starting.
+  --offline                     Start with zero internet request.
+  --correct                     Correct the filesystem.
+  -h --help                     Show this screen.
+  --version                     Show version.
+
+Defaults:
+  arch          Defaults to armv5-eabi.
+"""
+
+from docopt import docopt
+
+def main():
+    a = docopt(__doc__, version='arm_now 0.1')
+    if a["list"]:
+        do_list(a["--all"])
+    elif a["start"]:
+        do_start(a["<arch>"] or "armv5-eabi",
+                a["--clean"], a["--sync"], a["--offline"], a["--redir"])
+    elif a["clean"]:
+        do_clean()
+    elif a["resize"]:
+        do_resize(a["<new_size>"], a["--correct"])
+    elif a["install"]:
+        do_install(a["arch"] or "armv5-eabi", a["--clean"])
+
+#  ================ End Argument Parsing ==============================
+
 import urllib.request
 import requests
 import sys
@@ -187,9 +236,11 @@ def is_already_created(arch):
     do_clean()
     return False
 
-def install(arch):
+def do_install(arch, clean=False):
     """ download and setup filesystem and kernel
     """
+    if clean:
+        do_clean()
     if arch not in qemu_options:
         print("ERROR: I don't know this arch yet", file=sys.stderr)
         print("maybe you meant: {}".format(maybe_you_meant(arch, qemu_options.keys()) or qemu_options.keys()), file=sys.stderr)
@@ -209,6 +260,7 @@ def install(arch):
     download(rootfs, ROOTFS)
     with open(DIR + "/arch", "w") as F:
         F.write(arch)
+    print("[+] Installed")
 
 def avoid_parameter_injection(params):
     new_params = []
@@ -262,6 +314,7 @@ def config_filesystem(rootfs, arch):
 export PATH=$PATH:/opt/bin:/opt/sbin
                 """)
 
+@exall(subprocess.check_call, subprocess.CalledProcessError, print_error)
 def add_local_files(rootfs, dest):
     filemagic = magic.from_file(rootfs)
     if "ext2" not in filemagic:
@@ -270,7 +323,7 @@ def add_local_files(rootfs, dest):
     # TODO: check rootfs fs against parameter injection
     ext2_write_to_file(rootfs, "/sbin/save", 
             "cd /root\ntar cf /root.tar *\nsync\n")
-    print("Adding current directory to the filesystem..")
+    print("[+] Adding current directory to the filesystem..")
     with tempfile.TemporaryDirectory() as tmpdirname:
         files = [ i for i in os.listdir(".") if i != "arm_now" and not i.startswith("-") ]
         if files:
@@ -332,7 +385,7 @@ def parse_redir(redir):
             raise clize.ArgumentError("Invalid argument: --redir {}".format(r))
     return ''.join(map("-redir {} ".format, redir))
 
-def start(arch="", *, clean=False, sync=False, offline=False, redir:(clize.parameters.multi(min=0, max=3))):
+def do_start(arch, clean, sync, offline, redir):
     """Setup and start a virtualmachine using qemu.
 
     :param arch: The cpu architecture that will be started.
@@ -341,6 +394,12 @@ def start(arch="", *, clean=False, sync=False, offline=False, redir:(clize.param
     :param clean: Clean filesystem before starting.
     :param sync: Sync le current directory with the guest.
     """
+    print("start")
+    print(f"arch {arch}")
+    print(f"clean {clean}")
+    print(f"sync {sync}")
+    print(f"offline {offline}")
+    print(f"redir {redir}")
     redir = parse_redir(redir)
     if not arch:
         print("Supported architectures:")
@@ -350,7 +409,7 @@ def start(arch="", *, clean=False, sync=False, offline=False, redir:(clize.param
     if clean:
         do_clean()
     if not offline:
-        install(arch)
+        do_install(arch)
         config_filesystem(ROOTFS, arch)
     if sync:
         add_local_files(ROOTFS, "/root")
@@ -367,10 +426,22 @@ def do_clean():
     os.unlink(ROOTFS)
     shutil.rmtree(DIR, ignore_errors=True)
 
-def do_resize(size):
+class Color:
+    orange = "\x1B[33m"
+    green = "\x1B[32m"
+    red = "\x1B[31m"
+    normal = "\x1B[0m"
+
+def do_resize(size, correct):
     """ Resize filesystem.
     """
     subprocess.check_call(["qemu-img", "resize", ROOTFS, size])
+    subprocess.check_call(["e2fsck", "-fy", ROOTFS])
+    subprocess.check_call(["ls", "-lh", ROOTFS])
+    print("{c.green}[+] Resized to {size}{c.normal}".format(size=size, c=Color))
+    if correct:
+        print("{c.orange}[+] Correcting ... (be patient){c.normal}".format(size=size, c=Color))
+        subprocess.check_call("mke2fs -F -b 1024 -m 0 -g 272".split() + [ROOTFS])
 
 def test_arch(arch):
     arch = arch[:-1]
@@ -378,7 +449,7 @@ def test_arch(arch):
     if kernel and rootfs:
         print("{}: OK".format(arch))
 
-def list_arch(*, all=False):
+def do_list(all=False):
     """ List all compactible cpu architecture
     """
     if not all:
@@ -389,15 +460,5 @@ def list_arch(*, all=False):
         p = Pool(10)
         ret = p.map(test_arch, all_arch)
 
-# @exall(clize.run, Exception, print_error)
-def main():
-    clize.run({
-        "start": start,
-        "clean": do_clean,
-        "list": list_arch,
-        "resize": do_resize,
-        "install": install
-        })
-
 if __name__ == "__main__":
     main()

From d9e6a6afcebdf845f2b9257865b64a2794b75647 Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Thu, 31 May 2018 01:20:48 +0200
Subject: [PATCH 02/34] correct resize option

---
 arm_now/arm_now.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index 5bd24da..9fc43c7 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -414,6 +414,12 @@ def do_start(arch, clean, sync, offline, redir):
     if sync:
         add_local_files(ROOTFS, "/root")
     run(arch, KERNEL, DTB, ROOTFS, redir)
+    try:
+        subprocess.check_call(["e2fsck", "-vfy", ROOTFS])
+    except subprocess.CalledProcessError as e:
+        print(e)
+        if str(e).find("returned non-zero exit status 1."):
+            print("{c.orange}It's ok but next time poweroff{c.normal}".format(c=Color))
     if sync:
         get_local_files(ROOTFS, "/root.tar", ".")
 
@@ -436,6 +442,7 @@ def do_resize(size, correct):
     """ Resize filesystem.
     """
     subprocess.check_call(["qemu-img", "resize", ROOTFS, size])
+    subprocess.check_call(["resize2fs", ROOTFS])
     subprocess.check_call(["e2fsck", "-fy", ROOTFS])
     subprocess.check_call(["ls", "-lh", ROOTFS])
     print("{c.green}[+] Resized to {size}{c.normal}".format(size=size, c=Color))

From 29c6a8ce5628dd53ded1796c489f0c85199ee7c3 Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Thu, 31 May 2018 20:08:44 +0200
Subject: [PATCH 03/34] move all utils functions to utils.py

---
 arm_now/arm_now.py | 106 +++++--------------------------------------
 arm_now/utils.py   | 109 +++++++++++++++++++++++++++++++++++++++++++++
 dev-doc.md         |   5 +++
 3 files changed, 125 insertions(+), 95 deletions(-)
 create mode 100644 arm_now/utils.py
 create mode 100644 dev-doc.md

diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index 9fc43c7..6867e5c 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -5,10 +5,10 @@
 """arm_now.
 Usage:
   arm_now list [--all]
-  arm_now start [arch] [--clean] [--sync] [--offline] [--redir=<port>]...
+  arm_now start [<arch>] [--clean] [--sync] [--offline] [--redir=<port>]...
   arm_now clean
   arm_now resize <new_size> [--correct]
-  arm_now install [arch] [--clean]
+  arm_now install [<arch>] [--clean]
   arm_now -h | --help
   arm_now --version
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -46,7 +46,7 @@ def main():
     elif a["resize"]:
         do_resize(a["<new_size>"], a["--correct"])
     elif a["install"]:
-        do_install(a["arch"] or "armv5-eabi", a["--clean"])
+        do_install(a["<arch>"] or "armv5-eabi", a["--clean"])
 
 #  ================ End Argument Parsing ==============================
 
@@ -63,15 +63,13 @@ def main():
 import operator
 import subprocess
 import platform
-import tempfile
 import re
 
 # once cpio fully supported will we still need this magic ?
 import magic
-from pySmartDL import SmartDL
-import difflib
 import clize
 
+from utils import *
 from exall import exall, ignore, print_warning, print_traceback, print_error
 
 DOWNLOAD_CACHE_DIR = "/tmp/arm_now"
@@ -125,28 +123,6 @@ def main():
 DTB = DIR + "dtb"
 ROOTFS = DIR + "rootfs.ext2"
 
-def maybe_you_meant(string, strings):
-    return ' or '.join(difflib.get_close_matches(string, strings, cutoff=0.3))
-
-@exall(os.mkdir, FileExistsError, ignore)
-def download(url, filename):
-    print("\nDownloading {} from {}".format(filename, url))
-    filename_cache = url.split('/')[-1]
-    filename_cache = ''.join([ c for c in filename_cache if c.isdigit() or c.isalpha() ])
-    filename_cache = DOWNLOAD_CACHE_DIR + "/" + filename_cache
-    print(filename_cache)
-    if os.path.exists(filename):
-        print("Filexists")
-    elif os.path.exists(filename_cache):
-        print("Already downloaded")
-        shutil.copyfile(filename_cache, filename)
-    else:
-        os.mkdir(DOWNLOAD_CACHE_DIR)
-        # wget.download(url, out=filename_cache)
-        obj = SmartDL(url, filename_cache)
-        obj.start()
-        shutil.copyfile(filename_cache, filename)
-
 def indexof_parse(url):
     re_href = re.compile('\[DIR\].*href="?([^ <>"]*)"?')
     response = requests.get(url)
@@ -254,34 +230,14 @@ def do_install(arch, clean=False):
         return
     with contextlib.suppress(FileExistsError):
         os.mkdir(DIR)
-    download(kernel, KERNEL)
+    download(kernel, KERNEL, DOWNLOAD_CACHE_DIR)
     if dtb:
-        download(dtb, DTB)
-    download(rootfs, ROOTFS)
+        download(dtb, DTB, DOWNLOAD_CACHE_DIR)
+    download(rootfs, ROOTFS, DOWNLOAD_CACHE_DIR)
     with open(DIR + "/arch", "w") as F:
         F.write(arch)
     print("[+] Installed")
 
-def avoid_parameter_injection(params):
-    new_params = []
-    for p in params:
-        if p.startswith("-"):
-            print("WARNING: parameter injection detected, '{}' will be ingored".format(p))
-        else:
-            new_params.append(p)
-    return new_params
-
-def ext2_write_to_file(rootfs, dest, script):
-    with tempfile.TemporaryDirectory() as tmpdirname:
-        filename = tmpdirname + "/script"
-        print(filename)
-        with open(filename, "w") as F:
-            F.write(script)
-        subprocess.check_call("e2cp -G 0 -O 0 -P 555".split(' ') + [filename, rootfs + ":" + dest])
-
-def ext2_rm(rootfs, filename):
-    subprocess.check_call(["e2rm", rootfs + ":" + filename])
-
 def config_filesystem(rootfs, arch):
     filemagic = magic.from_file(rootfs)
     if "ext2" not in filemagic:
@@ -314,28 +270,6 @@ def config_filesystem(rootfs, arch):
 export PATH=$PATH:/opt/bin:/opt/sbin
                 """)
 
-@exall(subprocess.check_call, subprocess.CalledProcessError, print_error)
-def add_local_files(rootfs, dest):
-    filemagic = magic.from_file(rootfs)
-    if "ext2" not in filemagic:
-        print("{}\nthis filetype is not fully supported yet, but this will boot".format(filemagic))
-        return
-    # TODO: check rootfs fs against parameter injection
-    ext2_write_to_file(rootfs, "/sbin/save", 
-            "cd /root\ntar cf /root.tar *\nsync\n")
-    print("[+] Adding current directory to the filesystem..")
-    with tempfile.TemporaryDirectory() as tmpdirname:
-        files = [ i for i in os.listdir(".") if i != "arm_now" and not i.startswith("-") ]
-        if files:
-            tar = tmpdirname + "/current_directory.tar"
-            subprocess.check_call(["tar", "cf", tar] + files)
-            subprocess.check_call("e2cp -G 0 -O 0".split(' ') + [tar, rootfs + ":/"])
-            ext2_write_to_file(rootfs, "/etc/init.d/S95_sync_current_diretory","""
-                        cd /root
-                        tar xf /current_directory.tar
-                        rm /current_directory.tar
-                        """)
-
 @exall(subprocess.check_call, subprocess.CalledProcessError, print_warning)
 def get_local_files(rootfs, src, dest):
     filemagic = magic.from_file(rootfs)
@@ -349,19 +283,6 @@ def get_local_files(rootfs, src, dest):
     else:
         print("Use the 'save' command before exiting the vm to retrieve all files on the host")
 
-distribution = platform.linux_distribution()[0].lower()
-
-def which(filename, **kwargs):
-    try:
-        subprocess.check_output(["which", filename])
-        return True
-    except subprocess.CalledProcessError:
-        if distribution in kwargs:
-            print(kwargs[distribution])
-        else:
-            print(kwargs["ubuntu"])
-        return False
-
 def check_dependencies():
     dependencies = [
             which("e2cp", ubuntu="apt-get install e2tools", arch="yaourt -S e2tools"),
@@ -415,11 +336,12 @@ def do_start(arch, clean, sync, offline, redir):
         add_local_files(ROOTFS, "/root")
     run(arch, KERNEL, DTB, ROOTFS, redir)
     try:
+        print(" Checking the filesystem ".center(80, "+"))
         subprocess.check_call(["e2fsck", "-vfy", ROOTFS])
     except subprocess.CalledProcessError as e:
         print(e)
         if str(e).find("returned non-zero exit status 1."):
-            print("{c.orange}It's ok but next time poweroff{c.normal}".format(c=Color))
+            porange("It's ok but next time poweroff")
     if sync:
         get_local_files(ROOTFS, "/root.tar", ".")
 
@@ -432,12 +354,6 @@ def do_clean():
     os.unlink(ROOTFS)
     shutil.rmtree(DIR, ignore_errors=True)
 
-class Color:
-    orange = "\x1B[33m"
-    green = "\x1B[32m"
-    red = "\x1B[31m"
-    normal = "\x1B[0m"
-
 def do_resize(size, correct):
     """ Resize filesystem.
     """
@@ -445,9 +361,9 @@ def do_resize(size, correct):
     subprocess.check_call(["resize2fs", ROOTFS])
     subprocess.check_call(["e2fsck", "-fy", ROOTFS])
     subprocess.check_call(["ls", "-lh", ROOTFS])
-    print("{c.green}[+] Resized to {size}{c.normal}".format(size=size, c=Color))
+    pgreen("[+] Resized to {size}".format(size=size))
     if correct:
-        print("{c.orange}[+] Correcting ... (be patient){c.normal}".format(size=size, c=Color))
+        porange("[+] Correcting ... (be patient)".format(size=size))
         subprocess.check_call("mke2fs -F -b 1024 -m 0 -g 272".split() + [ROOTFS])
 
 def test_arch(arch):
diff --git a/arm_now/utils.py b/arm_now/utils.py
new file mode 100644
index 0000000..3347e74
--- /dev/null
+++ b/arm_now/utils.py
@@ -0,0 +1,109 @@
+import functools
+import subprocess
+import os
+import shutil
+import difflib
+import tempfile
+
+from pySmartDL import SmartDL
+from exall import exall, ignore, print_warning, print_traceback, print_error
+
+"""
+Utils functions:
+    pcolor: Print with beautiful colors: porange, pgreen, pred.
+    distribution: Return the current distribution name. 
+    which: Test if the command is installed.
+    maybe_you_meant: Smart correction of user provided input.
+    avoid_parameter_injection: Security check on user provided input.
+    ext2_write_to_file: Add a file to an existing ext2 image.
+    add_local_files: Add multiple files to an existing ex2 image.
+    ext2_rm: Delete a file from an existing ext2 image.
+"""
+
+def pcolor(color, *kargs, **kwargs):
+    print(color,end="")
+    print(*kargs, **kwargs,end="")
+    print("\x1B[0m")
+
+porange = functools.partial(pcolor, "\x1B[33m")
+pgreen = functools.partial(pcolor, "\x1B[32m")
+pred = functools.partial(pcolor, "\x1B[31m")
+
+@functools.lru_cache()
+def distribution():
+    return platform.linux_distribution()[0].lower()
+
+def which(filename, **kwargs):
+    try:
+        subprocess.check_output(["which", filename])
+        return True
+    except subprocess.CalledProcessError:
+        if distribution() in kwargs:
+            print(kwargs[distribution()])
+        else:
+            print(kwargs["ubuntu"])
+        return False
+
+def maybe_you_meant(string, strings):
+    return ' or '.join(difflib.get_close_matches(string, strings, cutoff=0.3))
+
+@exall(os.mkdir, FileExistsError, ignore)
+def download(url, filename, cache_directory):
+    print("\nDownloading {} from {}".format(filename, url))
+    filename_cache = url.split('/')[-1]
+    filename_cache = ''.join([ c for c in filename_cache if c.isdigit() or c.isalpha() ])
+    filename_cache = cache_directory + "/" + filename_cache
+    print(filename_cache)
+    if os.path.exists(filename):
+        print("Filexists")
+    elif os.path.exists(filename_cache):
+        print("Already downloaded")
+        shutil.copyfile(filename_cache, filename)
+    else:
+        os.mkdir(cache_directory)
+        # wget.download(url, out=filename_cache)
+        obj = SmartDL(url, filename_cache)
+        obj.start()
+        shutil.copyfile(filename_cache, filename)
+
+def avoid_parameter_injection(params):
+    new_params = []
+    for p in params:
+        if p.startswith("-"):
+            print("WARNING: parameter injection detected, '{}' will be ingored".format(p))
+        else:
+            new_params.append(p)
+    return new_params
+
+def ext2_write_to_file(rootfs, dest, script):
+    with tempfile.TemporaryDirectory() as tmpdirname:
+        filename = tmpdirname + "/script"
+        print(filename)
+        with open(filename, "w") as F:
+            F.write(script)
+        subprocess.check_call("e2cp -G 0 -O 0 -P 555".split(' ') + [filename, rootfs + ":" + dest])
+
+@exall(subprocess.check_call, subprocess.CalledProcessError, print_error)
+def add_local_files(rootfs, dest):
+    filemagic = magic.from_file(rootfs)
+    if "ext2" not in filemagic:
+        print("{}\nthis filetype is not fully supported yet, but this will boot".format(filemagic))
+        return
+    # TODO: check rootfs fs against parameter injection
+    ext2_write_to_file(rootfs, "/sbin/save", 
+            "cd /root\ntar cf /root.tar *\nsync\n")
+    print("[+] Adding current directory to the filesystem..")
+    with tempfile.TemporaryDirectory() as tmpdirname:
+        files = [ i for i in os.listdir(".") if i != "arm_now" and not i.startswith("-") ]
+        if files:
+            tar = tmpdirname + "/current_directory.tar"
+            subprocess.check_call(["tar", "cf", tar] + files)
+            subprocess.check_call("e2cp -G 0 -O 0".split(' ') + [tar, rootfs + ":/"])
+            ext2_write_to_file(rootfs, "/etc/init.d/S95_sync_current_diretory","""
+                        cd /root
+                        tar xf /current_directory.tar
+                        rm /current_directory.tar
+                        """)
+
+def ext2_rm(rootfs, filename):
+    subprocess.check_call(["e2rm", rootfs + ":" + filename])
diff --git a/dev-doc.md b/dev-doc.md
new file mode 100644
index 0000000..9187fdc
--- /dev/null
+++ b/dev-doc.md
@@ -0,0 +1,5 @@
+mkdir venv
+python3 -m venv venv
+python3 setup.py install
+# to delete untracked files !!
+git clean -fdx

From f75db62b3f09772ab8adf602d7f77d79e680277d Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Thu, 31 May 2018 20:54:16 +0200
Subject: [PATCH 04/34] resize fully working

---
 Changelog.txt      |  6 ++++++
 arm_now/arm_now.py | 27 ++++++++-------------------
 arm_now/utils.py   | 36 ++++++++++++++++++++++++++++--------
 3 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 10ff5fd..713c83e 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -25,6 +25,12 @@ Add tcp/udp --redir
 --- Mon Apr 23 2018
 Add --offline and --resize option by @NoobieDog
 
+--- Thu May 31 2018
+Correct --resize
+Fix bug with trying to sync big files
+Migrate from clize to docopt
+Refactor utils functions
+
 TODO:
 For --offline option check if local filesystem are avaiable otherwise exit cleanly and print a error message.
 For --resize option check with a regex if the parameter is correct to avoid command/parameter injection.
diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index 6867e5c..0042d95 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -63,10 +63,9 @@ def main():
 import operator
 import subprocess
 import platform
+import tempfile
 import re
 
-# once cpio fully supported will we still need this magic ?
-import magic
 import clize
 
 from utils import *
@@ -206,7 +205,7 @@ def is_already_created(arch):
         old_arch = F.read()
     if old_arch == arch:
         return True
-    response = input("(use --clean next time) Current directory contains a different arch, delete ? (y/n) ")
+    response = input("(use --clean next time) An {} image exists, delete ? (y/n) ".format(old_arch))
     if not response.startswith("y"):
         sys.exit(1)
     do_clean()
@@ -218,15 +217,15 @@ def do_install(arch, clean=False):
     if clean:
         do_clean()
     if arch not in qemu_options:
-        print("ERROR: I don't know this arch yet", file=sys.stderr)
-        print("maybe you meant: {}".format(maybe_you_meant(arch, qemu_options.keys()) or qemu_options.keys()), file=sys.stderr)
+        pred("ERROR: I don't know this arch yet", file=sys.stderr)
+        porange("maybe you meant: {}".format(maybe_you_meant(arch, qemu_options.keys()) or qemu_options.keys()), file=sys.stderr)
         sys.exit(1)
     kernel, dtb, rootfs = scrawl_kernel(arch)
     if kernel is None or rootfs is None:
-        print("ERROR: couldn't download files for this arch", file=sys.stderr)
+        pred("ERROR: couldn't download files for this arch", file=sys.stderr)
         sys.exit(1)
     if is_already_created(arch):
-        print("WARNING: {} already exists, use --clean to restart with a fresh filesystem".format(DIR))
+        porange("WARNING: {} already exists, use --clean to restart with a fresh filesystem".format(DIR))
         return
     with contextlib.suppress(FileExistsError):
         os.mkdir(DIR)
@@ -239,9 +238,7 @@ def do_install(arch, clean=False):
     print("[+] Installed")
 
 def config_filesystem(rootfs, arch):
-    filemagic = magic.from_file(rootfs)
-    if "ext2" not in filemagic:
-        print("{}\nthis filetype is not fully supported yet, but this will boot".format(filemagic))
+    if not is_ext2(rootfs):
         return
     try:
         ext2_rm(rootfs, '/etc/init.d/S40network')
@@ -272,9 +269,7 @@ def config_filesystem(rootfs, arch):
 
 @exall(subprocess.check_call, subprocess.CalledProcessError, print_warning)
 def get_local_files(rootfs, src, dest):
-    filemagic = magic.from_file(rootfs)
-    if "ext2" not in filemagic:
-        print("{}\nthis filetype is not fully supported yet, but this will boot".format(filemagic))
+    if not is_ext2(rootfs):
         return
     subprocess.check_call(["e2cp", rootfs + ":" + src, dest])
     if os.path.exists("root.tar"):
@@ -315,12 +310,6 @@ def do_start(arch, clean, sync, offline, redir):
     :param clean: Clean filesystem before starting.
     :param sync: Sync le current directory with the guest.
     """
-    print("start")
-    print(f"arch {arch}")
-    print(f"clean {clean}")
-    print(f"sync {sync}")
-    print(f"offline {offline}")
-    print(f"redir {redir}")
     redir = parse_redir(redir)
     if not arch:
         print("Supported architectures:")
diff --git a/arm_now/utils.py b/arm_now/utils.py
index 3347e74..fdc12af 100644
--- a/arm_now/utils.py
+++ b/arm_now/utils.py
@@ -1,10 +1,14 @@
 import functools
 import subprocess
 import os
+import sys
 import shutil
 import difflib
 import tempfile
+import contextlib
 
+# once cpio fully supported will we still need this magic ?
+import magic
 from pySmartDL import SmartDL
 from exall import exall, ignore, print_warning, print_traceback, print_error
 
@@ -21,9 +25,12 @@
 """
 
 def pcolor(color, *kargs, **kwargs):
-    print(color,end="")
-    print(*kargs, **kwargs,end="")
-    print("\x1B[0m")
+    """ proxy print arguments """
+    output = sys.stdout if "file" not in kwargs else kwargs["file"]
+    with contextlib.redirect_stdout(output):
+        print(color,end="")
+        print(*kargs, **kwargs,end="")
+        print("\x1B[0m")
 
 porange = functools.partial(pcolor, "\x1B[33m")
 pgreen = functools.partial(pcolor, "\x1B[32m")
@@ -78,16 +85,17 @@ def avoid_parameter_injection(params):
 def ext2_write_to_file(rootfs, dest, script):
     with tempfile.TemporaryDirectory() as tmpdirname:
         filename = tmpdirname + "/script"
-        print(filename)
         with open(filename, "w") as F:
             F.write(script)
         subprocess.check_call("e2cp -G 0 -O 0 -P 555".split(' ') + [filename, rootfs + ":" + dest])
 
-@exall(subprocess.check_call, subprocess.CalledProcessError, print_error)
+def print_error_tips(exception):
+    pred("ERROR: Plz try to resize your filesystem: arm_now resize 500M")
+    print_error(exception)
+
+@exall(subprocess.check_call, subprocess.CalledProcessError, print_error_tips)
 def add_local_files(rootfs, dest):
-    filemagic = magic.from_file(rootfs)
-    if "ext2" not in filemagic:
-        print("{}\nthis filetype is not fully supported yet, but this will boot".format(filemagic))
+    if not is_ext2(rootfs):
         return
     # TODO: check rootfs fs against parameter injection
     ext2_write_to_file(rootfs, "/sbin/save", 
@@ -101,9 +109,21 @@ def add_local_files(rootfs, dest):
             subprocess.check_call("e2cp -G 0 -O 0".split(' ') + [tar, rootfs + ":/"])
             ext2_write_to_file(rootfs, "/etc/init.d/S95_sync_current_diretory","""
                         cd /root
+                        echo "[+] Syncing with the current directory... (Be patient)"
+                        echo "Tips for big files:"
+                        echo "   Know that you only need to --sync once,"
+                        echo "   because the filesystem is persistent."
                         tar xf /current_directory.tar
                         rm /current_directory.tar
+                        rm /etc/init.d/S95_sync_current_diretory
                         """)
 
 def ext2_rm(rootfs, filename):
     subprocess.check_call(["e2rm", rootfs + ":" + filename])
+
+def is_ext2(rootfs):
+    filemagic = magic.from_file(rootfs)
+    if "ext2" not in filemagic:
+        print("{}\nthis filetype is not fully supported yet, but this will boot".format(filemagic))
+        return False
+    return True

From ec13879d1ad1ed6458ff238401f256b4107b3cdb Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Thu, 31 May 2018 20:57:48 +0200
Subject: [PATCH 05/34] add utils.py

---
 README.md | 2 +-
 setup.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e3e151d..928065f 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ arm_now instantly deploys and starts a virtual machine when needed, I mainly use
 
 # Install
 ```sh
-# pip3 install https://github.com/nongiach/arm_now/archive/master.zip
+# pip3 install https://github.com/nongiach/arm_now/archive/master.zip --upgrade
 ```
 
 # Start an arm Virtual Machine
diff --git a/setup.py b/setup.py
index e793421..b052b2e 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
         version='1.01',
         author='@chaign_c',
         url='https://github.com/nongiach/arm_now',
-        packages=['arm_now'],
+        packages=['arm_now', 'utils'],
         py_modules=['arm_now'],
         entry_points = {
             'console_scripts': [

From 80b1a53b0a96e911011f7d81faed59118cfa689a Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Thu, 31 May 2018 20:59:40 +0200
Subject: [PATCH 06/34] utils in py_modules

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index b052b2e..89d0a50 100644
--- a/setup.py
+++ b/setup.py
@@ -4,8 +4,8 @@
         version='1.01',
         author='@chaign_c',
         url='https://github.com/nongiach/arm_now',
-        packages=['arm_now', 'utils'],
-        py_modules=['arm_now'],
+        packages=['arm_now'],
+        py_modules=['arm_now', 'utils'],
         entry_points = {
             'console_scripts': [
                 'arm_now = arm_now:main',

From 42a475af0566d65b83a98551816f165f7371ca07 Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Thu, 31 May 2018 21:08:04 +0200
Subject: [PATCH 07/34] .utils

---
 arm_now/arm_now.py | 3 ++-
 dev-doc.md         | 3 ++-
 setup.py           | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index 0042d95..ac5c44e 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -68,7 +68,7 @@ def main():
 
 import clize
 
-from utils import *
+from .utils import *
 from exall import exall, ignore, print_warning, print_traceback, print_error
 
 DOWNLOAD_CACHE_DIR = "/tmp/arm_now"
@@ -205,6 +205,7 @@ def is_already_created(arch):
         old_arch = F.read()
     if old_arch == arch:
         return True
+    # response = input("(use --clean next time) Current directory contains a different arch ({}), delete ? (y/n) ".format(old_arch))
     response = input("(use --clean next time) An {} image exists, delete ? (y/n) ".format(old_arch))
     if not response.startswith("y"):
         sys.exit(1)
diff --git a/dev-doc.md b/dev-doc.md
index 9187fdc..2f81ea8 100644
--- a/dev-doc.md
+++ b/dev-doc.md
@@ -1,5 +1,6 @@
 mkdir venv
 python3 -m venv venv
+pip install arm_now
 python3 setup.py install
-# to delete untracked files !!
+# to delete untracked files populated by setup install
 git clean -fdx
diff --git a/setup.py b/setup.py
index 89d0a50..d7025ec 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
         author='@chaign_c',
         url='https://github.com/nongiach/arm_now',
         packages=['arm_now'],
-        py_modules=['arm_now', 'utils'],
+        py_modules=['arm_now', 'arm_now.utils'],
         entry_points = {
             'console_scripts': [
                 'arm_now = arm_now:main',

From ac0dafc528b68481dcd757c1c1c05929da747387 Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Thu, 31 May 2018 21:16:00 +0200
Subject: [PATCH 08/34] disable audio for a boot time sake

---
 arm_now/arm_now.py | 3 ++-
 setup.py           | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index ac5c44e..a6ef93a 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -35,7 +35,7 @@
 from docopt import docopt
 
 def main():
-    a = docopt(__doc__, version='arm_now 0.1')
+    a = docopt(__doc__, version='arm_now 1.2')
     if a["list"]:
         do_list(a["--all"])
     elif a["start"]:
@@ -186,6 +186,7 @@ def run(arch, kernel, dtb, rootfs, redir):
     print("Starting qemu-system-{}".format(arch))
     qemu_config = "-serial stdio -monitor /dev/null {redir}".format(redir=redir)
     cmd = """stty intr ^]
+       export QEMU_AUDIO_DRV="none"
        qemu-system-{arch} {options} \
                -m 256M \
                -nographic \
diff --git a/setup.py b/setup.py
index d7025ec..bc0b59d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, Extension
 
 setup(name='arm_now',
-        version='1.01',
+        version='1.02',
         author='@chaign_c',
         url='https://github.com/nongiach/arm_now',
         packages=['arm_now'],

From 4c0448a3d84ba08b63a1363684c3207711e158d1 Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Thu, 31 May 2018 21:23:01 +0200
Subject: [PATCH 09/34] test-run.sh

---
 Changelog.txt      | 3 +++
 arm_now/arm_now.py | 2 +-
 dev-doc.md         | 2 +-
 test-run.sh        | 6 ++++++
 4 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 test-run.sh

diff --git a/Changelog.txt b/Changelog.txt
index 713c83e..5f4aac9 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -30,8 +30,11 @@ Correct --resize
 Fix bug with trying to sync big files
 Migrate from clize to docopt
 Refactor utils functions
+Disable audio to gain boot speed
+
 
 TODO:
+Unit test
 For --offline option check if local filesystem are avaiable otherwise exit cleanly and print a error message.
 For --resize option check with a regex if the parameter is correct to avoid command/parameter injection.
 Search for new kernel and rootfs images, maybe I missed some of them that have ramfs inside the kernel image.
diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index a6ef93a..91198f9 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -195,7 +195,7 @@ def run(arch, kernel, dtb, rootfs, redir):
                -no-reboot
        stty intr ^c
     """.format(arch=arch, qemu_config=qemu_config, options=options, dtb=dtb)
-    print(cmd)
+    pgreen(cmd)
     os.system(cmd)
 
 def is_already_created(arch):
diff --git a/dev-doc.md b/dev-doc.md
index 2f81ea8..1de3af6 100644
--- a/dev-doc.md
+++ b/dev-doc.md
@@ -1,6 +1,6 @@
 mkdir venv
 python3 -m venv venv
-pip install arm_now
+pip uninstall arm_now
 python3 setup.py install
 # to delete untracked files populated by setup install
 git clean -fdx
diff --git a/test-run.sh b/test-run.sh
new file mode 100644
index 0000000..4ca8343
--- /dev/null
+++ b/test-run.sh
@@ -0,0 +1,6 @@
+# Commit and run this script, BUT COMMIT BEFORE if you don't want to loose change
+python3 -m venv venv
+pip uninstall arm_now
+python3 setup.py install
+# to delete untracked files populated by setup install
+git clean -fdx

From 1b44348941b7ce49538d95fe8aa296995df935ba Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Thu, 31 May 2018 21:46:10 +0200
Subject: [PATCH 10/34] e2fsck before resize

---
 arm_now/arm_now.py | 2 +-
 setup.py           | 2 +-
 test-run.sh        | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 test-run.sh

diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index 91198f9..9587bb3 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -349,8 +349,8 @@ def do_resize(size, correct):
     """ Resize filesystem.
     """
     subprocess.check_call(["qemu-img", "resize", ROOTFS, size])
-    subprocess.check_call(["resize2fs", ROOTFS])
     subprocess.check_call(["e2fsck", "-fy", ROOTFS])
+    subprocess.check_call(["resize2fs", ROOTFS])
     subprocess.check_call(["ls", "-lh", ROOTFS])
     pgreen("[+] Resized to {size}".format(size=size))
     if correct:
diff --git a/setup.py b/setup.py
index bc0b59d..5021e6b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, Extension
 
 setup(name='arm_now',
-        version='1.02',
+        version='1.2',
         author='@chaign_c',
         url='https://github.com/nongiach/arm_now',
         packages=['arm_now'],
diff --git a/test-run.sh b/test-run.sh
old mode 100644
new mode 100755
index 4ca8343..bb0f02b
--- a/test-run.sh
+++ b/test-run.sh
@@ -1,6 +1,7 @@
+# A dirty test script
 # Commit and run this script, BUT COMMIT BEFORE if you don't want to loose change
-python3 -m venv venv
-pip uninstall arm_now
-python3 setup.py install
+set -e
+sudo pip uninstall arm_now
+sudo python3 setup.py install
 # to delete untracked files populated by setup install
-git clean -fdx
+sudo git clean -fdx

From 929478a75c68e2923db5bd7dcf30324d5332f8dc Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Thu, 31 May 2018 22:36:51 +0200
Subject: [PATCH 11/34] move --redir to docopt

---
 Changelog.txt      |  2 ++
 arm_now/arm_now.py | 23 ++++++++++++++---------
 requirements.txt   |  8 ++++----
 setup.py           |  2 +-
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 5f4aac9..d12efb2 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -31,9 +31,11 @@ Fix bug with trying to sync big files
 Migrate from clize to docopt
 Refactor utils functions
 Disable audio to gain boot speed
+Add colors
 
 
 TODO:
+Add a project page describing every options, --redir .. 
 Unit test
 For --offline option check if local filesystem are avaiable otherwise exit cleanly and print a error message.
 For --resize option check with a regex if the parameter is correct to avoid command/parameter injection.
diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index 9587bb3..51b3f5d 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -5,7 +5,7 @@
 """arm_now.
 Usage:
   arm_now list [--all]
-  arm_now start [<arch>] [--clean] [--sync] [--offline] [--redir=<port>]...
+  arm_now start [<arch>] [--clean] [--sync] [--offline] [--redir=<port>]... [--add-qemu-options=<options>]
   arm_now clean
   arm_now resize <new_size> [--correct]
   arm_now install [<arch>] [--clean]
@@ -23,6 +23,7 @@
   --sync                        Synchronize the current directory with the vm home.
   --redir protocol:host::guest  Redirect the host port to the guest (example: --redir tcp:8000::80)
   --clean                       Clean the current image before starting.
+  --add-qemu-options=<options>  Add options to qemu-system-<arch>. (example: --add-qemu-options="-no-reboot")
   --offline                     Start with zero internet request.
   --correct                     Correct the filesystem.
   -h --help                     Show this screen.
@@ -40,7 +41,8 @@ def main():
         do_list(a["--all"])
     elif a["start"]:
         do_start(a["<arch>"] or "armv5-eabi",
-                a["--clean"], a["--sync"], a["--offline"], a["--redir"])
+                a["--clean"], a["--sync"], a["--offline"], a["--redir"],
+                a["--add-qemu-options"])
     elif a["clean"]:
         do_clean()
     elif a["resize"]:
@@ -66,8 +68,6 @@ def main():
 import tempfile
 import re
 
-import clize
-
 from .utils import *
 from exall import exall, ignore, print_warning, print_traceback, print_error
 
@@ -278,7 +278,7 @@ def get_local_files(rootfs, src, dest):
         subprocess.check_call("tar xf root.tar".split(' '))
         os.unlink("root.tar")
     else:
-        print("Use the 'save' command before exiting the vm to retrieve all files on the host")
+        pgreen("Use the 'save' command before exiting the vm to retrieve all files on the host")
 
 def check_dependencies():
     dependencies = [
@@ -297,13 +297,14 @@ def parse_redir(redir):
     qemu_redir = []
     for r in redir:
         if not re_redir.match(r):
+            pred("ERROR: Invalid argument: --redir {}".format(r))
             print("example:")
             print("\tredirect tcp host 8000 to guest 80: --redir tcp:8000::80")
             print("\tredirect udp host 4444 to guest 44: --redir udp:4444::44")
-            raise clize.ArgumentError("Invalid argument: --redir {}".format(r))
+            sys.exit(1)
     return ''.join(map("-redir {} ".format, redir))
 
-def do_start(arch, clean, sync, offline, redir):
+def do_start(arch, clean, sync, offline, redir, add_qemu_options):
     """Setup and start a virtualmachine using qemu.
 
     :param arch: The cpu architecture that will be started.
@@ -313,11 +314,15 @@ def do_start(arch, clean, sync, offline, redir):
     :param sync: Sync le current directory with the guest.
     """
     redir = parse_redir(redir)
+    print("o" * 40)
+    print(add_qemu_options)
+    print(redir)
     if not arch:
         print("Supported architectures:")
         print(list_arch())
-        raise clize.ArgumentError("no arch specified")
-        check_dependencies()
+        pred("ERROR: no arch specified")
+        sys.exit(1)
+    check_dependencies()
     if clean:
         do_clean()
     if not offline:
diff --git a/requirements.txt b/requirements.txt
index 65ac5da..765c05b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-exall==1.0
-requests==2.18.4
-clize==4.0.3
-pySmartDL==1.2.5
+exall>=0.11
+requests>=2.18.4
+pySmartDL>=1.2.5
+docopt>=0.6.2
diff --git a/setup.py b/setup.py
index 5021e6b..a875717 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
         install_requires=[
             'exall',
             'requests',
-            'clize',
+            'docopt',
             'pySmartDL',
             'python-magic'
             ],

From 5ec15659651bc7aebf4a145894c7b8437c403c7f Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Fri, 1 Jun 2018 01:52:59 +0200
Subject: [PATCH 12/34] --add-qemu-options

---
 Changelog.txt      |  9 ++++++++-
 arm_now/arm_now.py | 15 ++++++++-------
 arm_now/utils.py   |  2 +-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index d12efb2..ee92aba 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -32,10 +32,17 @@ Migrate from clize to docopt
 Refactor utils functions
 Disable audio to gain boot speed
 Add colors
+Add -add-qemu-options
 
 
 TODO:
-Add a project page describing every options, --redir .. 
+find binary-samples/ -type f |tee filelist | e2cp -apv -d arm_now/rootfs.ext2:/
+10.0.2.2 is the host ip
+use mkisofs or genisoimage to create an iso from a folder. 
+https://unix.stackexchange.com/questions/90793/create-iso-image-from-folder-via-terminal-commands
+sudo mount -o loop output_image.iso iso/
+
+Add a wiki page describing every options, --redir ..  and use of alias
 Unit test
 For --offline option check if local filesystem are avaiable otherwise exit cleanly and print a error message.
 For --resize option check with a regex if the parameter is correct to avoid command/parameter injection.
diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index 51b3f5d..0ec56aa 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -5,7 +5,7 @@
 """arm_now.
 Usage:
   arm_now list [--all]
-  arm_now start [<arch>] [--clean] [--sync] [--offline] [--redir=<port>]... [--add-qemu-options=<options>]
+  arm_now start [<arch>] [--clean] [--sync] [--offline] [--add-qemu-options=<options>] [--redir=<port>]... 
   arm_now clean
   arm_now resize <new_size> [--correct]
   arm_now install [<arch>] [--clean]
@@ -23,7 +23,8 @@
   --sync                        Synchronize the current directory with the vm home.
   --redir protocol:host::guest  Redirect the host port to the guest (example: --redir tcp:8000::80)
   --clean                       Clean the current image before starting.
-  --add-qemu-options=<options>  Add options to qemu-system-<arch>. (example: --add-qemu-options="-no-reboot")
+  --add-qemu-options=<options>  Add options to qemu-system-<arch>.
+                     (example: --add-qemu-options="-sandbox on" to Enable seccomp mode 2 system call filter )
   --offline                     Start with zero internet request.
   --correct                     Correct the filesystem.
   -h --help                     Show this screen.
@@ -42,7 +43,7 @@ def main():
     elif a["start"]:
         do_start(a["<arch>"] or "armv5-eabi",
                 a["--clean"], a["--sync"], a["--offline"], a["--redir"],
-                a["--add-qemu-options"])
+                ' '.join(a["--add-qemu-options"]))
     elif a["clean"]:
         do_clean()
     elif a["resize"]:
@@ -179,12 +180,12 @@ def scrawl_kernel(arch):
     kernel = None if "kernel" not in links_dict[state][libc] else links_dict[state][libc]["kernel"]
     return kernel, dtb, rootfs
 
-def run(arch, kernel, dtb, rootfs, redir):
+def run(arch, kernel, dtb, rootfs, add_qemu_options):
     dtb = "" if not os.path.exists(dtb) else "-dtb {}".format(dtb)
     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 {redir}".format(redir=redir)
+    qemu_config = "-serial stdio -monitor /dev/null {add_qemu_options}".format(add_qemu_options=add_qemu_options)
     cmd = """stty intr ^]
        export QEMU_AUDIO_DRV="none"
        qemu-system-{arch} {options} \
@@ -314,9 +315,9 @@ def do_start(arch, clean, sync, offline, redir, add_qemu_options):
     :param sync: Sync le current directory with the guest.
     """
     redir = parse_redir(redir)
+    add_qemu_options += " " + redir
     print("o" * 40)
     print(add_qemu_options)
-    print(redir)
     if not arch:
         print("Supported architectures:")
         print(list_arch())
@@ -330,7 +331,7 @@ def do_start(arch, clean, sync, offline, redir, add_qemu_options):
         config_filesystem(ROOTFS, arch)
     if sync:
         add_local_files(ROOTFS, "/root")
-    run(arch, KERNEL, DTB, ROOTFS, redir)
+    run(arch, KERNEL, DTB, ROOTFS, add_qemu_options)
     try:
         print(" Checking the filesystem ".center(80, "+"))
         subprocess.check_call(["e2fsck", "-vfy", ROOTFS])
diff --git a/arm_now/utils.py b/arm_now/utils.py
index fdc12af..720393e 100644
--- a/arm_now/utils.py
+++ b/arm_now/utils.py
@@ -104,7 +104,7 @@ def add_local_files(rootfs, dest):
     with tempfile.TemporaryDirectory() as tmpdirname:
         files = [ i for i in os.listdir(".") if i != "arm_now" and not i.startswith("-") ]
         if files:
-            tar = tmpdirname + "/current_directory.tar"
+            oar = tmpdirname + "/current_directory.tar"
             subprocess.check_call(["tar", "cf", tar] + files)
             subprocess.check_call("e2cp -G 0 -O 0".split(' ') + [tar, rootfs + ":/"])
             ext2_write_to_file(rootfs, "/etc/init.d/S95_sync_current_diretory","""

From 818259e218d2a60a77f5a58ad83842c2639220ed Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Sat, 2 Jun 2018 13:00:59 +0200
Subject: [PATCH 13/34] --autostart=<script>

---
 Changelog.txt      |  1 +
 arm_now/arm_now.py | 19 +++++++++++++++----
 test-run.sh        |  3 ++-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index ee92aba..dae90ab 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -36,6 +36,7 @@ Add -add-qemu-options
 
 
 TODO:
+Add a new features sections
 find binary-samples/ -type f |tee filelist | e2cp -apv -d arm_now/rootfs.ext2:/
 10.0.2.2 is the host ip
 use mkisofs or genisoimage to create an iso from a folder. 
diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index 0ec56aa..754d188 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -5,7 +5,7 @@
 """arm_now.
 Usage:
   arm_now list [--all]
-  arm_now start [<arch>] [--clean] [--sync] [--offline] [--add-qemu-options=<options>] [--redir=<port>]... 
+  arm_now start [<arch>] [--clean] [--sync] [--offline] [--autostart=<script>] [--add-qemu-options=<options>] [--redir=<port>]... 
   arm_now clean
   arm_now resize <new_size> [--correct]
   arm_now install [<arch>] [--clean]
@@ -25,8 +25,12 @@
   --clean                       Clean the current image before starting.
   --add-qemu-options=<options>  Add options to qemu-system-<arch>.
                      (example: --add-qemu-options="-sandbox on" to Enable seccomp mode 2 system call filter )
+  --autostart=<script>          At startup <script> is uploaded and executed inside the vm.
+  --syncpath=<path>             Synchronize the <path> directory with the vm home.
+  --syncroot=<path>             Synchronize the <path> directory with the vm root.
+                            (Only if you need to modify the linux vm config)
   --offline                     Start with zero internet request.
-  --correct                     Correct the filesystem.
+  --correct                     Correct the filesystem after resize.
   -h --help                     Show this screen.
   --version                     Show version.
 
@@ -43,7 +47,8 @@ def main():
     elif a["start"]:
         do_start(a["<arch>"] or "armv5-eabi",
                 a["--clean"], a["--sync"], a["--offline"], a["--redir"],
-                ' '.join(a["--add-qemu-options"]))
+                ' '.join(a["--add-qemu-options"]),
+                a["--autostart"])
     elif a["clean"]:
         do_clean()
     elif a["resize"]:
@@ -305,7 +310,7 @@ def parse_redir(redir):
             sys.exit(1)
     return ''.join(map("-redir {} ".format, redir))
 
-def do_start(arch, clean, sync, offline, redir, add_qemu_options):
+def do_start(arch, clean, sync, offline, redir, add_qemu_options, autostart):
     """Setup and start a virtualmachine using qemu.
 
     :param arch: The cpu architecture that will be started.
@@ -331,6 +336,12 @@ def do_start(arch, clean, sync, offline, redir, add_qemu_options):
         config_filesystem(ROOTFS, arch)
     if sync:
         add_local_files(ROOTFS, "/root")
+    if autostart:
+        print("AUTOSTART: {autostart}".format(autostart=autostart))
+        subprocess.check_call("e2cp -G 0 -O 0 -P 555".split(' ') +
+                [autostart, ROOTFS + ":/etc/init.d/S90_user_autostart"])
+    else:
+        ext2_rm(ROOTFS, "/etc/init.d/S90_user_autostart")
     run(arch, KERNEL, DTB, ROOTFS, add_qemu_options)
     try:
         print(" Checking the filesystem ".center(80, "+"))
diff --git a/test-run.sh b/test-run.sh
index bb0f02b..0e05024 100755
--- a/test-run.sh
+++ b/test-run.sh
@@ -1,6 +1,7 @@
 # A dirty test script
 # Commit and run this script, BUT COMMIT BEFORE if you don't want to loose change
-set -e
+# set -e
+sudo pip uninstall arm_now
 sudo pip uninstall arm_now
 sudo python3 setup.py install
 # to delete untracked files populated by setup install

From be61dc4fc4bda9efbc16ab47d8ce7aecb2b1a176 Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Sat, 2 Jun 2018 14:33:02 +0200
Subject: [PATCH 14/34] refactor filesystem

---
 arm_now/arm_now.py    |   3 +-
 arm_now/filesystem.py | 103 ++++++++++++++++++++++++++++++++++++++++++
 arm_now/utils.py      |  47 -------------------
 3 files changed, 105 insertions(+), 48 deletions(-)
 create mode 100644 arm_now/filesystem.py

diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index 754d188..06a21e7 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -75,6 +75,7 @@ def main():
 import re
 
 from .utils import *
+from .filesystem import *
 from exall import exall, ignore, print_warning, print_traceback, print_error
 
 DOWNLOAD_CACHE_DIR = "/tmp/arm_now"
@@ -341,7 +342,7 @@ def do_start(arch, clean, sync, offline, redir, add_qemu_options, autostart):
         subprocess.check_call("e2cp -G 0 -O 0 -P 555".split(' ') +
                 [autostart, ROOTFS + ":/etc/init.d/S90_user_autostart"])
     else:
-        ext2_rm(ROOTFS, "/etc/init.d/S90_user_autostart")
+        ext2_rm(ROOTFS, "/etc/init.d/S90_user_autostart", force=True)
     run(arch, KERNEL, DTB, ROOTFS, add_qemu_options)
     try:
         print(" Checking the filesystem ".center(80, "+"))
diff --git a/arm_now/filesystem.py b/arm_now/filesystem.py
new file mode 100644
index 0000000..16dafea
--- /dev/null
+++ b/arm_now/filesystem.py
@@ -0,0 +1,103 @@
+import subprocess
+import tempfile
+
+import magic
+from exall import exall, ignore, print_warning, print_traceback, print_error
+
+def ext2_write_to_file(rootfs, dest, script):
+    with tempfile.TemporaryDirectory() as tmpdirname:
+        filename = tmpdirname + "/script"
+        with open(filename, "w") as F:
+            F.write(script)
+        subprocess.check_call("e2cp -G 0 -O 0 -P 555".split(' ') + [filename, rootfs + ":" + dest])
+
+def print_error_tips(exception):
+    pred("ERROR: Plz try to resize your filesystem: arm_now resize 500M")
+    print_error(exception)
+
+@exall(subprocess.check_call, subprocess.CalledProcessError, print_error_tips)
+def add_local_files(rootfs, dest):
+    if not is_ext2(rootfs):
+        return
+    # TODO: check rootfs fs against parameter injection
+    ext2_write_to_file(rootfs, "/sbin/save", 
+            "cd /root\ntar cf /root.tar *\nsync\n")
+    print("[+] Adding current directory to the filesystem..")
+    with tempfile.TemporaryDirectory() as tmpdirname:
+        files = [ i for i in os.listdir(".") if i != "arm_now" and not i.startswith("-") ]
+        if files:
+            oar = tmpdirname + "/current_directory.tar"
+            subprocess.check_call(["tar", "cf", tar] + files)
+            subprocess.check_call("e2cp -G 0 -O 0".split(' ') + [tar, rootfs + ":/"])
+            ext2_write_to_file(rootfs, "/etc/init.d/S95_sync_current_diretory","""
+                        cd /root
+                        echo "[+] Syncing with the current directory... (Be patient)"
+                        echo "Tips for big files:"
+                        echo "   Know that you only need to --sync once,"
+                        echo "   because the filesystem is persistent."
+                        tar xf /current_directory.tar
+                        rm /current_directory.tar
+                        rm /etc/init.d/S95_sync_current_diretory
+                        """)
+
+def ext2_rm(rootfs, filename, force=False):
+    if force:
+        with exall(subprocess.check_call, subprocess.CalledProcessError, print_warning):
+            subprocess.check_call(["e2rm", rootfs + ":" + filename])
+    else:
+        subprocess.check_call(["e2rm", rootfs + ":" + filename])
+
+def is_ext2(rootfs):
+    filemagic = magic.from_file(rootfs)
+    if "ext2" not in filemagic:
+        print("{}\nthis filetype is not fully supported yet, but this will boot".format(filemagic))
+        return False
+    return True
+
+def Filesystem(path):
+    filemagic = magic.from_file(rootfs)
+    if "ext2" in filemagic:
+        return Ext2(path)
+    return UnknownFileSystem(path, filemagic)
+
+class Ext2:
+    def __init__(self, path):
+        self.rootfs = path
+
+    def put(self, src, dest, right="444"):
+        subprocess.check_call("e2cp -G 0 -O 0 -P".split(' ') +
+                [right, src, self.rootfs + ":" + dest])
+
+    def get(self, src, dest):
+        subprocess.check_call(["e2cp", self.rootfs + ":" + src, dest])
+
+    def rm(self, filename, on_error=print_error):
+        with exall(subprocess.check_call, subprocess.CalledProcessError, print_warning):
+            subprocess.check_call(["e2rm", self.rootfs + ":" + filename])
+
+    def put_content(self, content, dest, right="444"):
+        with tempfile.NamedTemporaryFile() as temp:
+            temp.write(bytes(content, "utf-8"))
+            temp.flush()
+            subprocess.check_call("e2cp -G 0 -O 0 -P".split(' ') +
+                    [right, temp.name, self.rootfs + ":" + dest])
+
+class UnknownFileSystem:
+    def __init__(self, path, filemagic):
+        self.rootfs = path
+        porange("UnknownFileSystem({}, {})".format(path, filemagic))
+
+    def __call__(self, t):
+        pred("__CALL__ {}".format(t))
+
+    def put(self, src, dest, right="444"):
+        print("put is not implented for {}".format(self.rootfs))
+
+    def get(self, src, dest):
+        print("get is not implented for {}".format(self.rootfs))
+
+    def rm(self, filename, on_error=print_error):
+        print("rm is not implented for {}".format(self.rootfs))
+
+    def put_content(self, content, dest, right="444"):
+        print("put_content is not implented for {}".format(self.rootfs))
diff --git a/arm_now/utils.py b/arm_now/utils.py
index 720393e..8c9cffc 100644
--- a/arm_now/utils.py
+++ b/arm_now/utils.py
@@ -4,7 +4,6 @@
 import sys
 import shutil
 import difflib
-import tempfile
 import contextlib
 
 # once cpio fully supported will we still need this magic ?
@@ -81,49 +80,3 @@ def avoid_parameter_injection(params):
         else:
             new_params.append(p)
     return new_params
-
-def ext2_write_to_file(rootfs, dest, script):
-    with tempfile.TemporaryDirectory() as tmpdirname:
-        filename = tmpdirname + "/script"
-        with open(filename, "w") as F:
-            F.write(script)
-        subprocess.check_call("e2cp -G 0 -O 0 -P 555".split(' ') + [filename, rootfs + ":" + dest])
-
-def print_error_tips(exception):
-    pred("ERROR: Plz try to resize your filesystem: arm_now resize 500M")
-    print_error(exception)
-
-@exall(subprocess.check_call, subprocess.CalledProcessError, print_error_tips)
-def add_local_files(rootfs, dest):
-    if not is_ext2(rootfs):
-        return
-    # TODO: check rootfs fs against parameter injection
-    ext2_write_to_file(rootfs, "/sbin/save", 
-            "cd /root\ntar cf /root.tar *\nsync\n")
-    print("[+] Adding current directory to the filesystem..")
-    with tempfile.TemporaryDirectory() as tmpdirname:
-        files = [ i for i in os.listdir(".") if i != "arm_now" and not i.startswith("-") ]
-        if files:
-            oar = tmpdirname + "/current_directory.tar"
-            subprocess.check_call(["tar", "cf", tar] + files)
-            subprocess.check_call("e2cp -G 0 -O 0".split(' ') + [tar, rootfs + ":/"])
-            ext2_write_to_file(rootfs, "/etc/init.d/S95_sync_current_diretory","""
-                        cd /root
-                        echo "[+] Syncing with the current directory... (Be patient)"
-                        echo "Tips for big files:"
-                        echo "   Know that you only need to --sync once,"
-                        echo "   because the filesystem is persistent."
-                        tar xf /current_directory.tar
-                        rm /current_directory.tar
-                        rm /etc/init.d/S95_sync_current_diretory
-                        """)
-
-def ext2_rm(rootfs, filename):
-    subprocess.check_call(["e2rm", rootfs + ":" + filename])
-
-def is_ext2(rootfs):
-    filemagic = magic.from_file(rootfs)
-    if "ext2" not in filemagic:
-        print("{}\nthis filetype is not fully supported yet, but this will boot".format(filemagic))
-        return False
-    return True

From d7e5c75543ea742b7a32040b9f1cb9986291a531 Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Sat, 2 Jun 2018 18:16:25 +0200
Subject: [PATCH 15/34] refactor options

---
 arm_now/arm_now.py    | 146 ++++++++++++------------------------------
 arm_now/config.py     |  51 +++++++++++++++
 arm_now/filesystem.py |  85 ++++++++----------------
 arm_now/options.py    |  18 ++++++
 test-run.sh           |   2 +-
 5 files changed, 136 insertions(+), 166 deletions(-)
 create mode 100644 arm_now/config.py
 create mode 100644 arm_now/options.py

diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index 06a21e7..da0ca8b 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -76,59 +76,9 @@ def main():
 
 from .utils import *
 from .filesystem import *
+from .config import *
 from exall import exall, ignore, print_warning, print_traceback, print_error
 
-DOWNLOAD_CACHE_DIR = "/tmp/arm_now"
-
-qemu_options = {
-	"aarch64": ["aarch64", "-M virt -cpu cortex-a57 -smp 1 -kernel {kernel} -append 'root=/dev/vda console=ttyAMA0' -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 -drive file={rootfs},if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"],
-        "armv5-eabi": ["arm", "-M vexpress-a9 -kernel {kernel} -sd {rootfs} -append 'root=/dev/mmcblk0 console=ttyAMA0 rw physmap.enabled=0 noapic'"], # check log
-        "armv6-eabihf": ["arm", "-M vexpress-a9 -kernel {kernel} -sd {rootfs} -append 'root=/dev/mmcblk0 console=ttyAMA0 rw physmap.enabled=0 noapic'"], # check log
-        "armv7-eabihf": ["arm", "-M vexpress-a9 -kernel {kernel} -sd {rootfs} -append 'root=/dev/mmcblk0 console=ttyAMA0 rw physmap.enabled=0 noapic'"], # check log
-        # "bfin":, TODO
-        # "m68k-68xxx":, TODO 
-        "m68k-coldfire": ["m68k", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
-        "microblazebe": ["microblaze", "-M petalogix-s3adsp1800 -kernel {kernel} -nographic"], # rootfs is inside the kernel file, but we also have a separated rootfs if needed
-        "microblazeel": ["microblazeel", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=tty0 rw physmap.enabled=0 noapic'"], # check log
-        "mips32": ["mips", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/hda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
-        "mips32el": ["mipsel", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/hda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
-	"mips32r5el": ["mipsel", "-machine malta -cpu P5600 -kernel {kernel} -drive file={rootfs},format=raw -append 'root=/dev/hda rw'"],
-        "mips32r6el": ["mipsel", "-M malta -cpu mips32r6-generic -kernel {kernel} -drive file={rootfs},format=raw -append root=/dev/hda -net nic,model=pcnet -net user"],
-        "mips64-n32": ["mips64", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/hda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
-        "mips64el-n32": ["mips64el", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/hda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
-        # "mips64r6el-n32":, TODO check log
-        # "mips64r6el-n32": ["mips64el", "-machine malta -kernel {kernel} -drive file={rootfs},format=raw -append 'root=/dev/hda rw console=ttyS0,'"], # check log
-        "nios2": ["nios2", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
-        "powerpc64-e5500": ["ppc64", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
-        "powerpc64-power8": ["ppc64", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
-        "powerpc64le-power8": ["ppc64", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
-        "sh-sh4": ["sh4", "-M r2d -serial vc -kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
-        # "sparc64":, TODO check log
-        # "sparc64": ["sparc64", "-M sun4u -kernel {kernel} -append 'root=/dev/sda console=ttyS0,115200' -drive file={rootfs},format=raw -net nic,model=e1000 -net user"], # this causes kernel crash
-        # ":sparcv8":, TODO, check log, 
-        # "sparcv8": ["sparc", "-machine SS-10 -kernel {kernel} -drive file={rootfs},format=raw -append 'root=/dev/sda console=ttyS0,115200' -net nic,model=lance -net user"], # error
-        # "x86-64-core-i7":["x86_64", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # old
-        "x86-64-core-i7" : ["x86_64", "-M pc -kernel {kernel} -drive file={rootfs},if=virtio,format=raw -append 'root=/dev/vda rw console=ttyS0' -net nic,model=virtio -net user"],
-        # "x86-core2" : ["i386", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic -net nic,model=virtio -net user'"],
-	"x86-core2": ["i386", "-M pc -kernel {kernel} -drive file={rootfs},if=virtio,format=raw -append 'root=/dev/vda rw console=ttyS0' -net nic,model=virtio -net user"], # fix opkg
-        "x86-i686":["i386", "-M pc -kernel {kernel} -drive file={rootfs},if=virtio,format=raw -append 'root=/dev/vda rw console=ttyS0' -net nic,model=virtio -net user"],
-        "xtensa-lx60": ["xtensa", "-M lx60 -cpu dc233c -monitor null -nographic -kernel {kernel} -monitor null"]
-        }
-
-install_opkg = {
-        "armv5-eabi":"""wget -O - http://pkg.entware.net/binaries/armv5/installer/entware_install.sh | /bin/sh""",
-        "armv7-eabihf":"""wget -O - http://pkg.entware.net/binaries/armv5/installer/entware_install.sh | /bin/sh""",
-        "mips32el":"""wget -O - http://pkg.entware.net/binaries/mipsel/installer/installer.sh | /bin/sh""",
-        "x86-64-core-i7":"""wget -O - http://pkg.entware.net/binaries/x86-64/installer/entware_install.sh | /bin/sh""",
-        "x86-core2":"""wget -O - http://pkg.entware.net/binaries/x86-32/installer/entware_install.sh | /bin/sh""",
-        "x86-i686":"""wget -O - http://pkg.entware.net/binaries/x86-32/installer/entware_install.sh | /bin/sh""",
-}
-
-DIR = "arm_now/"
-KERNEL = DIR + "kernel"
-DTB = DIR + "dtb"
-ROOTFS = DIR + "rootfs.ext2"
-
 def indexof_parse(url):
     re_href = re.compile('\[DIR\].*href="?([^ <>"]*)"?')
     response = requests.get(url)
@@ -207,9 +157,9 @@ def run(arch, kernel, dtb, rootfs, add_qemu_options):
 
 def is_already_created(arch):
     """ if the current kernel and rootfs is not the same arch then delete them """
-    if not os.path.exists(DIR + "/arch"):
+    if not os.path.exists(Config.DIR + "/arch"):
         return False
-    with open(DIR + "/arch", "r") as F:
+    with open(Config.DIR + "/arch", "r") as F:
         old_arch = F.read()
     if old_arch == arch:
         return True
@@ -234,53 +184,52 @@ def do_install(arch, clean=False):
         pred("ERROR: couldn't download files for this arch", file=sys.stderr)
         sys.exit(1)
     if is_already_created(arch):
-        porange("WARNING: {} already exists, use --clean to restart with a fresh filesystem".format(DIR))
+        porange("WARNING: {} already exists, use --clean to restart with a fresh filesystem".format(Config.DIR))
         return
     with contextlib.suppress(FileExistsError):
-        os.mkdir(DIR)
-    download(kernel, KERNEL, DOWNLOAD_CACHE_DIR)
+        os.mkdir(Config.DIR)
+    download(kernel, Config.KERNEL, DOWNLOAD_CACHE_DIR)
     if dtb:
-        download(dtb, DTB, DOWNLOAD_CACHE_DIR)
-    download(rootfs, ROOTFS, DOWNLOAD_CACHE_DIR)
-    with open(DIR + "/arch", "w") as F:
+        download(dtb, Config.DTB, DOWNLOAD_CACHE_DIR)
+    download(rootfs, Config.ROOTFS, DOWNLOAD_CACHE_DIR)
+    with open(Config.DIR + "/arch", "w") as F:
         F.write(arch)
     print("[+] Installed")
 
+
 def config_filesystem(rootfs, arch):
-    if not is_ext2(rootfs):
-        return
-    try:
-        ext2_rm(rootfs, '/etc/init.d/S40network')
-        ext2_rm(rootfs, '/etc/init.d/S90tests')
-        ext2_rm(rootfs, '/etc/issue')
-    except subprocess.CalledProcessError as e:
-        print("WARNING: e2rm failed !!!")
-    ext2_write_to_file(rootfs, "/etc/issue", 
+    fs = Filesystem(rootfs)
+    fs.rm('/etc/init.d/S40network')
+    fs.rm('/etc/init.d/S90tests')
+    fs.rm('/etc/issue')
+    fs.create("/etc/issue", 
             'Welcome to arm_now\n')
-    ext2_write_to_file(rootfs, "/etc/init.d/S95_how_to_kill_qemu", 
-            'echo -e "\033[0;31mpress ctrl+] to kill qemu\033[0m"\n')
-    ext2_write_to_file(rootfs, "/etc/init.d/S40_network","""
+    fs.create("/etc/init.d/S95_how_to_kill_qemu",
+            'echo -e "\033[0;31mpress ctrl+] to kill qemu\033[0m"\n',
+            right=555)
+    fs.create("/etc/init.d/S40_network","""
 IFACE=$(ip a | grep -o ':.*: ' | grep -v ': lo: ' | grep -o '[^ :@]*' | head -n 1)
 ifconfig "$IFACE" 10.0.2.15
 route add default gw 10.0.2.2
 echo 'nameserver 10.0.2.3' >> /etc/resolv.conf
-""")
+""", right=555)
     if arch in install_opkg:
-        ext2_write_to_file(rootfs, "/root/install_pkg_manager.sh", """
+        fs.create("/root/install_pkg_manager.sh", """
 {install_opkg}
 opkg update
 echo -e '\n\n now you can $ opkg install gdb'
 rm /root/install_pkg_manager.sh
-""".format(install_opkg=install_opkg[arch]))
-        ext2_write_to_file(rootfs, "/etc/profile.d/opkg_path.sh", """
+""".format(install_opkg=install_opkg[arch]), right=555)
+        fs.create("/etc/profile.d/opkg_path.sh", """
 export PATH=$PATH:/opt/bin:/opt/sbin
-                """)
+                """, right=555)
 
 @exall(subprocess.check_call, subprocess.CalledProcessError, print_warning)
 def get_local_files(rootfs, src, dest):
-    if not is_ext2(rootfs):
+    fs = Filesystem(rootfs)
+    if not fs.implemented():
         return
-    subprocess.check_call(["e2cp", rootfs + ":" + src, dest])
+    fs.get(src, dest)
     if os.path.exists("root.tar"):
         subprocess.check_call("tar xf root.tar".split(' '))
         os.unlink("root.tar")
@@ -330,50 +279,35 @@ def do_start(arch, clean, sync, offline, redir, add_qemu_options, autostart):
         pred("ERROR: no arch specified")
         sys.exit(1)
     check_dependencies()
-    if clean:
-        do_clean()
+    if clean: option.clean()
     if not offline:
         do_install(arch)
-        config_filesystem(ROOTFS, arch)
-    if sync:
-        add_local_files(ROOTFS, "/root")
-    if autostart:
-        print("AUTOSTART: {autostart}".format(autostart=autostart))
-        subprocess.check_call("e2cp -G 0 -O 0 -P 555".split(' ') +
-                [autostart, ROOTFS + ":/etc/init.d/S90_user_autostart"])
-    else:
-        ext2_rm(ROOTFS, "/etc/init.d/S90_user_autostart", force=True)
-    run(arch, KERNEL, DTB, ROOTFS, add_qemu_options)
+        config_filesystem(Config.ROOTFS, arch)
+    if sync: options.sync(Config.ROOTFS, src=".", dest="/root")
+    options.autostart(autostart)
+
+    run(arch, Config.KERNEL, Config.DTB, Config.ROOTFS, add_qemu_options)
     try:
         print(" Checking the filesystem ".center(80, "+"))
-        subprocess.check_call(["e2fsck", "-vfy", ROOTFS])
+        subprocess.check_call(["e2fsck", "-vfy", Config.ROOTFS])
     except subprocess.CalledProcessError as e:
         print(e)
         if str(e).find("returned non-zero exit status 1."):
             porange("It's ok but next time poweroff")
     if sync:
-        get_local_files(ROOTFS, "/root.tar", ".")
-
-@exall(os.unlink, FileNotFoundError, ignore)
-def do_clean():
-    """ Clean the filesystem.
-    """
-    os.unlink(KERNEL)
-    os.unlink(DTB)
-    os.unlink(ROOTFS)
-    shutil.rmtree(DIR, ignore_errors=True)
+        get_local_files(Config.ROOTFS, "/root.tar", ".")
 
 def do_resize(size, correct):
     """ Resize filesystem.
     """
-    subprocess.check_call(["qemu-img", "resize", ROOTFS, size])
-    subprocess.check_call(["e2fsck", "-fy", ROOTFS])
-    subprocess.check_call(["resize2fs", ROOTFS])
-    subprocess.check_call(["ls", "-lh", ROOTFS])
+    subprocess.check_call(["qemu-img", "resize", Config.ROOTFS, size])
+    subprocess.check_call(["e2fsck", "-fy", Config.ROOTFS])
+    subprocess.check_call(["resize2fs", Config.ROOTFS])
+    subprocess.check_call(["ls", "-lh", Config.ROOTFS])
     pgreen("[+] Resized to {size}".format(size=size))
     if correct:
         porange("[+] Correcting ... (be patient)".format(size=size))
-        subprocess.check_call("mke2fs -F -b 1024 -m 0 -g 272".split() + [ROOTFS])
+        subprocess.check_call("mke2fs -F -b 1024 -m 0 -g 272".split() + [Config.ROOTFS])
 
 def test_arch(arch):
     arch = arch[:-1]
diff --git a/arm_now/config.py b/arm_now/config.py
new file mode 100644
index 0000000..b1df6b7
--- /dev/null
+++ b/arm_now/config.py
@@ -0,0 +1,51 @@
+class Config:
+    DIR = "arm_now/"
+    KERNEL = DIR + "kernel"
+    DTB = DIR + "dtb"
+    ROOTFS = DIR + "rootfs.ext2"
+    DOWNLOAD_CACHE_DIR = "/tmp/arm_now"
+
+qemu_options = {
+	"aarch64": ["aarch64", "-M virt -cpu cortex-a57 -smp 1 -kernel {kernel} -append 'root=/dev/vda console=ttyAMA0' -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 -drive file={rootfs},if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"],
+        "armv5-eabi": ["arm", "-M vexpress-a9 -kernel {kernel} -sd {rootfs} -append 'root=/dev/mmcblk0 console=ttyAMA0 rw physmap.enabled=0 noapic'"], # check log
+        "armv6-eabihf": ["arm", "-M vexpress-a9 -kernel {kernel} -sd {rootfs} -append 'root=/dev/mmcblk0 console=ttyAMA0 rw physmap.enabled=0 noapic'"], # check log
+        "armv7-eabihf": ["arm", "-M vexpress-a9 -kernel {kernel} -sd {rootfs} -append 'root=/dev/mmcblk0 console=ttyAMA0 rw physmap.enabled=0 noapic'"], # check log
+        # "bfin":, TODO
+        # "m68k-68xxx":, TODO 
+        "m68k-coldfire": ["m68k", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
+        "microblazebe": ["microblaze", "-M petalogix-s3adsp1800 -kernel {kernel} -nographic"], # rootfs is inside the kernel file, but we also have a separated rootfs if needed
+        "microblazeel": ["microblazeel", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=tty0 rw physmap.enabled=0 noapic'"], # check log
+        "mips32": ["mips", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/hda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
+        "mips32el": ["mipsel", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/hda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
+	"mips32r5el": ["mipsel", "-machine malta -cpu P5600 -kernel {kernel} -drive file={rootfs},format=raw -append 'root=/dev/hda rw'"],
+        "mips32r6el": ["mipsel", "-M malta -cpu mips32r6-generic -kernel {kernel} -drive file={rootfs},format=raw -append root=/dev/hda -net nic,model=pcnet -net user"],
+        "mips64-n32": ["mips64", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/hda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
+        "mips64el-n32": ["mips64el", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/hda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
+        # "mips64r6el-n32":, TODO check log
+        # "mips64r6el-n32": ["mips64el", "-machine malta -kernel {kernel} -drive file={rootfs},format=raw -append 'root=/dev/hda rw console=ttyS0,'"], # check log
+        "nios2": ["nios2", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
+        "powerpc64-e5500": ["ppc64", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
+        "powerpc64-power8": ["ppc64", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
+        "powerpc64le-power8": ["ppc64", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
+        "sh-sh4": ["sh4", "-M r2d -serial vc -kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # check log
+        # "sparc64":, TODO check log
+        # "sparc64": ["sparc64", "-M sun4u -kernel {kernel} -append 'root=/dev/sda console=ttyS0,115200' -drive file={rootfs},format=raw -net nic,model=e1000 -net user"], # this causes kernel crash
+        # ":sparcv8":, TODO, check log, 
+        # "sparcv8": ["sparc", "-machine SS-10 -kernel {kernel} -drive file={rootfs},format=raw -append 'root=/dev/sda console=ttyS0,115200' -net nic,model=lance -net user"], # error
+        # "x86-64-core-i7":["x86_64", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic'"], # old
+        "x86-64-core-i7" : ["x86_64", "-M pc -kernel {kernel} -drive file={rootfs},if=virtio,format=raw -append 'root=/dev/vda rw console=ttyS0' -net nic,model=virtio -net user"],
+        # "x86-core2" : ["i386", "-kernel {kernel} -hda {rootfs} -append 'root=/dev/sda console=ttyS0 rw physmap.enabled=0 noapic -net nic,model=virtio -net user'"],
+	"x86-core2": ["i386", "-M pc -kernel {kernel} -drive file={rootfs},if=virtio,format=raw -append 'root=/dev/vda rw console=ttyS0' -net nic,model=virtio -net user"], # fix opkg
+        "x86-i686":["i386", "-M pc -kernel {kernel} -drive file={rootfs},if=virtio,format=raw -append 'root=/dev/vda rw console=ttyS0' -net nic,model=virtio -net user"],
+        "xtensa-lx60": ["xtensa", "-M lx60 -cpu dc233c -monitor null -nographic -kernel {kernel} -monitor null"]
+        }
+
+install_opkg = {
+        "armv5-eabi":"""wget -O - http://pkg.entware.net/binaries/armv5/installer/entware_install.sh | /bin/sh""",
+        "armv7-eabihf":"""wget -O - http://pkg.entware.net/binaries/armv5/installer/entware_install.sh | /bin/sh""",
+        "mips32el":"""wget -O - http://pkg.entware.net/binaries/mipsel/installer/installer.sh | /bin/sh""",
+        "x86-64-core-i7":"""wget -O - http://pkg.entware.net/binaries/x86-64/installer/entware_install.sh | /bin/sh""",
+        "x86-core2":"""wget -O - http://pkg.entware.net/binaries/x86-32/installer/entware_install.sh | /bin/sh""",
+        "x86-i686":"""wget -O - http://pkg.entware.net/binaries/x86-32/installer/entware_install.sh | /bin/sh""",
+}
+
diff --git a/arm_now/filesystem.py b/arm_now/filesystem.py
index 16dafea..8609ee4 100644
--- a/arm_now/filesystem.py
+++ b/arm_now/filesystem.py
@@ -3,59 +3,18 @@
 
 import magic
 from exall import exall, ignore, print_warning, print_traceback, print_error
+from .utils import *
+
+# def ext2_write_to_file(rootfs, dest, script):
+#     with tempfile.TemporaryDirectory() as tmpdirname:
+#         filename = tmpdirname + "/script"
+#         with open(filename, "w") as F:
+#             F.write(script)
+#         subprocess.check_call("e2cp -G 0 -O 0 -P 555".split(' ') + [filename, rootfs + ":" + dest])
 
-def ext2_write_to_file(rootfs, dest, script):
-    with tempfile.TemporaryDirectory() as tmpdirname:
-        filename = tmpdirname + "/script"
-        with open(filename, "w") as F:
-            F.write(script)
-        subprocess.check_call("e2cp -G 0 -O 0 -P 555".split(' ') + [filename, rootfs + ":" + dest])
-
-def print_error_tips(exception):
-    pred("ERROR: Plz try to resize your filesystem: arm_now resize 500M")
-    print_error(exception)
-
-@exall(subprocess.check_call, subprocess.CalledProcessError, print_error_tips)
-def add_local_files(rootfs, dest):
-    if not is_ext2(rootfs):
-        return
-    # TODO: check rootfs fs against parameter injection
-    ext2_write_to_file(rootfs, "/sbin/save", 
-            "cd /root\ntar cf /root.tar *\nsync\n")
-    print("[+] Adding current directory to the filesystem..")
-    with tempfile.TemporaryDirectory() as tmpdirname:
-        files = [ i for i in os.listdir(".") if i != "arm_now" and not i.startswith("-") ]
-        if files:
-            oar = tmpdirname + "/current_directory.tar"
-            subprocess.check_call(["tar", "cf", tar] + files)
-            subprocess.check_call("e2cp -G 0 -O 0".split(' ') + [tar, rootfs + ":/"])
-            ext2_write_to_file(rootfs, "/etc/init.d/S95_sync_current_diretory","""
-                        cd /root
-                        echo "[+] Syncing with the current directory... (Be patient)"
-                        echo "Tips for big files:"
-                        echo "   Know that you only need to --sync once,"
-                        echo "   because the filesystem is persistent."
-                        tar xf /current_directory.tar
-                        rm /current_directory.tar
-                        rm /etc/init.d/S95_sync_current_diretory
-                        """)
-
-def ext2_rm(rootfs, filename, force=False):
-    if force:
-        with exall(subprocess.check_call, subprocess.CalledProcessError, print_warning):
-            subprocess.check_call(["e2rm", rootfs + ":" + filename])
-    else:
-        subprocess.check_call(["e2rm", rootfs + ":" + filename])
-
-def is_ext2(rootfs):
-    filemagic = magic.from_file(rootfs)
-    if "ext2" not in filemagic:
-        print("{}\nthis filetype is not fully supported yet, but this will boot".format(filemagic))
-        return False
-    return True
 
 def Filesystem(path):
-    filemagic = magic.from_file(rootfs)
+    filemagic = magic.from_file(path)
     if "ext2" in filemagic:
         return Ext2(path)
     return UnknownFileSystem(path, filemagic)
@@ -64,33 +23,41 @@ class Ext2:
     def __init__(self, path):
         self.rootfs = path
 
-    def put(self, src, dest, right="444"):
+    def implemented(self):
+        return True
+
+    def put(self, src, dest, right=444):
         subprocess.check_call("e2cp -G 0 -O 0 -P".split(' ') +
-                [right, src, self.rootfs + ":" + dest])
+                [str(right), src, self.rootfs + ":" + dest])
 
     def get(self, src, dest):
         subprocess.check_call(["e2cp", self.rootfs + ":" + src, dest])
 
-    def rm(self, filename, on_error=print_error):
-        with exall(subprocess.check_call, subprocess.CalledProcessError, print_warning):
+    def rm(self, filename):
+        def e2rm_warning(_exception):
+            porange("WARNING: e2rm file already suppressed")
+        with exall(subprocess.check_call, subprocess.CalledProcessError, e2rm_warning):
             subprocess.check_call(["e2rm", self.rootfs + ":" + filename])
 
-    def put_content(self, content, dest, right="444"):
+    def create(self, dest, content, right=444):
         with tempfile.NamedTemporaryFile() as temp:
             temp.write(bytes(content, "utf-8"))
             temp.flush()
             subprocess.check_call("e2cp -G 0 -O 0 -P".split(' ') +
-                    [right, temp.name, self.rootfs + ":" + dest])
+                    [str(right), temp.name, self.rootfs + ":" + dest])
 
 class UnknownFileSystem:
     def __init__(self, path, filemagic):
         self.rootfs = path
         porange("UnknownFileSystem({}, {})".format(path, filemagic))
 
+    def implemented(self):
+        return False
+
     def __call__(self, t):
         pred("__CALL__ {}".format(t))
 
-    def put(self, src, dest, right="444"):
+    def put(self, src, dest, right=444):
         print("put is not implented for {}".format(self.rootfs))
 
     def get(self, src, dest):
@@ -99,5 +66,5 @@ def get(self, src, dest):
     def rm(self, filename, on_error=print_error):
         print("rm is not implented for {}".format(self.rootfs))
 
-    def put_content(self, content, dest, right="444"):
-        print("put_content is not implented for {}".format(self.rootfs))
+    def create(self, dest, content, right=444):
+        print("create is not implented for {}".format(self.rootfs))
diff --git a/arm_now/options.py b/arm_now/options.py
new file mode 100644
index 0000000..c590114
--- /dev/null
+++ b/arm_now/options.py
@@ -0,0 +1,18 @@
+import os
+import shutil
+
+@exall(os.unlink, FileNotFoundError, ignore)
+def do_clean():
+    """ Clean the filesystem.
+    """
+    os.unlink(KERNEL)
+    os.unlink(DTB)
+    os.unlink(ROOTFS)
+    shutil.rmtree(DIR, ignore_errors=True)
+
+def autostart(script):
+    if autostart:
+        print("AUTOSTART: {autostart}".format(autostart=autostart))
+        fs.put(autostart, "/etc/init.d/S90_user_autostart", right=555)
+    else:
+        ext2_rm(ROOTFS, "/etc/init.d/S90_user_autostart")
diff --git a/test-run.sh b/test-run.sh
index 0e05024..621b2f6 100755
--- a/test-run.sh
+++ b/test-run.sh
@@ -5,4 +5,4 @@ sudo pip uninstall arm_now
 sudo pip uninstall arm_now
 sudo python3 setup.py install
 # to delete untracked files populated by setup install
-sudo git clean -fdx
+# sudo git clean -fdx

From 0273eadeb3d827971b17b461f9356377f2943053 Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Sat, 2 Jun 2018 18:22:45 +0200
Subject: [PATCH 16/34] move options

---
 arm_now/arm_now.py |  3 ++-
 arm_now/options.py | 23 +++++++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index da0ca8b..e4855eb 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -77,6 +77,7 @@ def main():
 from .utils import *
 from .filesystem import *
 from .config import *
+from . import options
 from exall import exall, ignore, print_warning, print_traceback, print_error
 
 def indexof_parse(url):
@@ -284,7 +285,7 @@ def do_start(arch, clean, sync, offline, redir, add_qemu_options, autostart):
         do_install(arch)
         config_filesystem(Config.ROOTFS, arch)
     if sync: options.sync(Config.ROOTFS, src=".", dest="/root")
-    options.autostart(autostart)
+    options.autostart(Config.ROOTFS, autostart)
 
     run(arch, Config.KERNEL, Config.DTB, Config.ROOTFS, add_qemu_options)
     try:
diff --git a/arm_now/options.py b/arm_now/options.py
index c590114..9d74e4d 100644
--- a/arm_now/options.py
+++ b/arm_now/options.py
@@ -1,18 +1,21 @@
 import os
 import shutil
 
+from exall import exall, ignore, print_warning, print_traceback, print_error
+from .filesystem import *
+
 @exall(os.unlink, FileNotFoundError, ignore)
-def do_clean():
+def do_clean(config):
     """ Clean the filesystem.
     """
-    os.unlink(KERNEL)
-    os.unlink(DTB)
-    os.unlink(ROOTFS)
-    shutil.rmtree(DIR, ignore_errors=True)
+    os.unlink(config.KERNEL)
+    os.unlink(config.DTB)
+    os.unlink(config.ROOTFS)
+    shutil.rmtree(config.DIR, ignore_errors=True)
 
-def autostart(script):
-    if autostart:
-        print("AUTOSTART: {autostart}".format(autostart=autostart))
-        fs.put(autostart, "/etc/init.d/S90_user_autostart", right=555)
+def autostart(rootfs, script):
+    fs = Filesystem(rootfs)
+    if script:
+        fs.put(script, "/etc/init.d/S90_user_autostart", right=555)
     else:
-        ext2_rm(ROOTFS, "/etc/init.d/S90_user_autostart")
+        fs.rm("/etc/init.d/S90_user_autostart")

From fbd6d7f32384baf9b851887899bd5ea3f2e6e973 Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Sat, 2 Jun 2018 18:37:14 +0200
Subject: [PATCH 17/34] add preconfigure.sh

---
 arm_now/arm_now.py | 15 +++++++--------
 arm_now/options.py |  2 +-
 preconfigure.sh    |  7 +++++++
 3 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 preconfigure.sh

diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index e4855eb..10c6c74 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -50,7 +50,7 @@ def main():
                 ' '.join(a["--add-qemu-options"]),
                 a["--autostart"])
     elif a["clean"]:
-        do_clean()
+        options.clean(Config)
     elif a["resize"]:
         do_resize(a["<new_size>"], a["--correct"])
     elif a["install"]:
@@ -168,14 +168,13 @@ def is_already_created(arch):
     response = input("(use --clean next time) An {} image exists, delete ? (y/n) ".format(old_arch))
     if not response.startswith("y"):
         sys.exit(1)
-    do_clean()
+    options.clean(Config)
     return False
 
 def do_install(arch, clean=False):
     """ download and setup filesystem and kernel
     """
-    if clean:
-        do_clean()
+    if clean: options.clean(Config)
     if arch not in qemu_options:
         pred("ERROR: I don't know this arch yet", file=sys.stderr)
         porange("maybe you meant: {}".format(maybe_you_meant(arch, qemu_options.keys()) or qemu_options.keys()), file=sys.stderr)
@@ -189,10 +188,10 @@ def do_install(arch, clean=False):
         return
     with contextlib.suppress(FileExistsError):
         os.mkdir(Config.DIR)
-    download(kernel, Config.KERNEL, DOWNLOAD_CACHE_DIR)
+    download(kernel, Config.KERNEL, Config.DOWNLOAD_CACHE_DIR)
     if dtb:
-        download(dtb, Config.DTB, DOWNLOAD_CACHE_DIR)
-    download(rootfs, Config.ROOTFS, DOWNLOAD_CACHE_DIR)
+        download(dtb, Config.DTB, Config.DOWNLOAD_CACHE_DIR)
+    download(rootfs, Config.ROOTFS, Config.DOWNLOAD_CACHE_DIR)
     with open(Config.DIR + "/arch", "w") as F:
         F.write(arch)
     print("[+] Installed")
@@ -280,7 +279,7 @@ def do_start(arch, clean, sync, offline, redir, add_qemu_options, autostart):
         pred("ERROR: no arch specified")
         sys.exit(1)
     check_dependencies()
-    if clean: option.clean()
+    if clean: option.clean(Config)
     if not offline:
         do_install(arch)
         config_filesystem(Config.ROOTFS, arch)
diff --git a/arm_now/options.py b/arm_now/options.py
index 9d74e4d..544ca3d 100644
--- a/arm_now/options.py
+++ b/arm_now/options.py
@@ -5,7 +5,7 @@
 from .filesystem import *
 
 @exall(os.unlink, FileNotFoundError, ignore)
-def do_clean(config):
+def clean(config):
     """ Clean the filesystem.
     """
     os.unlink(config.KERNEL)
diff --git a/preconfigure.sh b/preconfigure.sh
new file mode 100644
index 0000000..9df82ec
--- /dev/null
+++ b/preconfigure.sh
@@ -0,0 +1,7 @@
+arm_now clean
+cat <<EOF>>autostart.sh
+cd /root
+./install_pkg_manager.sh
+poweroff
+EOF
+arm_now start --autostart autostart.sh

From 94d85d8a46fdde2345b9d5cb08e45c00346bd806 Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Sat, 2 Jun 2018 19:51:14 +0200
Subject: [PATCH 18/34] sync

---
 arm_now/options.py | 24 ++++++++++++++++++++++++
 preconfigure.sh    | 13 ++++++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 preconfigure.sh

diff --git a/arm_now/options.py b/arm_now/options.py
index 544ca3d..1065853 100644
--- a/arm_now/options.py
+++ b/arm_now/options.py
@@ -19,3 +19,27 @@ def autostart(rootfs, script):
         fs.put(script, "/etc/init.d/S90_user_autostart", right=555)
     else:
         fs.rm("/etc/init.d/S90_user_autostart")
+
+def sync(rootfs, src, dest):
+    fs = Filesystem(rootfs)
+    if not fs.implemented():
+        return
+    print("Adding current directory to the filesystem..")
+    with tempfile.TemporaryDirectory() as tmpdirname:
+        files = [ i for i in os.listdir(".") if i != "arm_now" and not i.startswith("-") ]
+        if files:
+            tar = tmpdirname + "/current_directory.tar"
+            subprocess.check_call(["tar", "cf", tar] + files)
+            subprocess.check_call("e2cp -G 0 -O 0".split(' ') + [tar, rootfs + ":/"])
+            fs.create("/etc/init.d/S95_sync_current_diretory","""
+                        cd {dest}
+                        tar xf /current_directory.tar
+                        rm /current_directory.tar
+                        """.format(dest=dest), right=555)
+
+    # TODO: check rootfs fs against parameter injection
+    fs.create("/sbin/save", """
+                cd {dest}
+                tar cf /root.tar *
+                sync
+                """.format(dest=dest), right=555)
diff --git a/preconfigure.sh b/preconfigure.sh
old mode 100644
new mode 100755
index 9df82ec..32e9536
--- a/preconfigure.sh
+++ b/preconfigure.sh
@@ -1,7 +1,18 @@
+cd ../
+rm -rf preconfig
+mkdir preconfig
+cd preconfig
 arm_now clean
+mkdir cacert
+cd cacert
+curl https://curl.haxx.se/ca/cacert.pem | awk 'split_after==1{n++;split_after=0} /-----END CERTIFICATE-----/ {split_after=1} {print > "cert" n ".pem"}'
 cat <<EOF>>autostart.sh
 cd /root
 ./install_pkg_manager.sh
+opkg install wget
+rm /usr/bin/wget
+sed 's/http:/https:/g' /opt/etc/opkg.conf > /opt/etc/opkg.conf.bak
+mv /opt/etc/opkg.conf.bak /opt/etc/opkg.conf
 poweroff
 EOF
-arm_now start --autostart autostart.sh
+arm_now start --autostart autostart.sh --sync

From eb03f5f5c289c658013ea4c73ccb47984990d897 Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Sat, 2 Jun 2018 20:57:37 +0200
Subject: [PATCH 19/34] wget ssl

---
 arm_now/options.py |  1 +
 preconfigure.sh    | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/arm_now/options.py b/arm_now/options.py
index 1065853..b04ae75 100644
--- a/arm_now/options.py
+++ b/arm_now/options.py
@@ -35,6 +35,7 @@ def sync(rootfs, src, dest):
                         cd {dest}
                         tar xf /current_directory.tar
                         rm /current_directory.tar
+                        rm /etc/init.d/S95_sync_current_diretory
                         """.format(dest=dest), right=555)
 
     # TODO: check rootfs fs against parameter injection
diff --git a/preconfigure.sh b/preconfigure.sh
index 32e9536..f031e7b 100755
--- a/preconfigure.sh
+++ b/preconfigure.sh
@@ -6,13 +6,26 @@ arm_now clean
 mkdir cacert
 cd cacert
 curl https://curl.haxx.se/ca/cacert.pem | awk 'split_after==1{n++;split_after=0} /-----END CERTIFICATE-----/ {split_after=1} {print > "cert" n ".pem"}'
+cd -
 cat <<EOF>>autostart.sh
 cd /root
 ./install_pkg_manager.sh
+env
+source /etc/profile.d/opkg_path.sh
+
+echo 'export SSL_CERT_DIR=/etc/ssl/certs' >> /etc/profile
+source /etc/profile
+opkg install ca-certificates
+rm /etc/ssl/certs/ -rf
+mkdir /etc/ssl
+ln -s /opt/etc/ssl/certs/ /etc/ssl/certs
+
 opkg install wget
 rm /usr/bin/wget
 sed 's/http:/https:/g' /opt/etc/opkg.conf > /opt/etc/opkg.conf.bak
 mv /opt/etc/opkg.conf.bak /opt/etc/opkg.conf
+
 poweroff
 EOF
 arm_now start --autostart autostart.sh --sync
+# openssl-util

From 25023949f1837414dacec5e838da81e29ce19592 Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Sat, 2 Jun 2018 21:45:18 +0200
Subject: [PATCH 20/34] Filesystem.sed

---
 arm_now/arm_now.py    |  1 +
 arm_now/filesystem.py | 26 ++++++++++++++++++++++----
 preconfigure.sh       | 30 +++++++++++++++++-------------
 3 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index 10c6c74..af8652a 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -223,6 +223,7 @@ def config_filesystem(rootfs, arch):
         fs.create("/etc/profile.d/opkg_path.sh", """
 export PATH=$PATH:/opt/bin:/opt/sbin
                 """, right=555)
+    fs.sed('s/init.d\/S/init.d\/K/g', '/etc/init.d/rcK', right=755)
 
 @exall(subprocess.check_call, subprocess.CalledProcessError, print_warning)
 def get_local_files(rootfs, src, dest):
diff --git a/arm_now/filesystem.py b/arm_now/filesystem.py
index 8609ee4..ed07d81 100644
--- a/arm_now/filesystem.py
+++ b/arm_now/filesystem.py
@@ -1,5 +1,6 @@
 import subprocess
 import tempfile
+import os
 
 import magic
 from exall import exall, ignore, print_warning, print_traceback, print_error
@@ -46,6 +47,20 @@ def create(self, dest, content, right=444):
             subprocess.check_call("e2cp -G 0 -O 0 -P".split(' ') +
                     [str(right), temp.name, self.rootfs + ":" + dest])
 
+    def sed(self, regex, path, right=444):
+        """ Replace with sed in the roofs
+        Example: fs.sed('s/init.d\/S/init.d\/K/g', '/etc/init.d/rcK', right=755)
+        Insecure !! command injection here but regex is not exposed to user input
+        """
+        with tempfile.TemporaryDirectory() as tempdir:
+            print("Tempdir {}".format(tempdir))
+            new = tempdir + "/new"
+            old = tempdir + "/old"
+            self.get(path, old)
+            subprocess.check_call("sed '{regex}' {old} > {new}".format(
+                regex=regex, new=new, old=old), shell=True)
+            self.put(new, path, right=right)
+
 class UnknownFileSystem:
     def __init__(self, path, filemagic):
         self.rootfs = path
@@ -58,13 +73,16 @@ def __call__(self, t):
         pred("__CALL__ {}".format(t))
 
     def put(self, src, dest, right=444):
-        print("put is not implented for {}".format(self.rootfs))
+        porange("put is not implented for {}".format(self.rootfs))
 
     def get(self, src, dest):
-        print("get is not implented for {}".format(self.rootfs))
+        porange("get is not implented for {}".format(self.rootfs))
 
     def rm(self, filename, on_error=print_error):
-        print("rm is not implented for {}".format(self.rootfs))
+        porange("rm is not implented for {}".format(self.rootfs))
 
     def create(self, dest, content, right=444):
-        print("create is not implented for {}".format(self.rootfs))
+        porange("create is not implented for {}".format(self.rootfs))
+
+    def sed(self, regex, path, right=444):
+        porange("sed is not implented for {}".format(self.rootfs))
diff --git a/preconfigure.sh b/preconfigure.sh
index f031e7b..675d971 100755
--- a/preconfigure.sh
+++ b/preconfigure.sh
@@ -9,23 +9,27 @@ curl https://curl.haxx.se/ca/cacert.pem | awk 'split_after==1{n++;split_after=0}
 cd -
 cat <<EOF>>autostart.sh
 cd /root
-./install_pkg_manager.sh
-env
-source /etc/profile.d/opkg_path.sh
+if [[ -e ./install_pkg_manager.sh ]]
+then
+  ./install_pkg_manager.sh
+  env
+  source /etc/profile.d/opkg_path.sh
 
-echo 'export SSL_CERT_DIR=/etc/ssl/certs' >> /etc/profile
-source /etc/profile
-opkg install ca-certificates
-rm /etc/ssl/certs/ -rf
-mkdir /etc/ssl
-ln -s /opt/etc/ssl/certs/ /etc/ssl/certs
+  echo 'export SSL_CERT_DIR=/etc/ssl/certs' >> /etc/profile
+  source /etc/profile
+  opkg install ca-certificates
+  rm /etc/ssl/certs/ -rf
+  mkdir /etc/ssl
+  ln -s /opt/etc/ssl/certs/ /etc/ssl/certs
 
-opkg install wget
-rm /usr/bin/wget
-sed 's/http:/https:/g' /opt/etc/opkg.conf > /opt/etc/opkg.conf.bak
-mv /opt/etc/opkg.conf.bak /opt/etc/opkg.conf
+  opkg install wget
+  rm /usr/bin/wget
+  sed 's/http:/https:/g' /opt/etc/opkg.conf > /opt/etc/opkg.conf.bak
+  mv /opt/etc/opkg.conf.bak /opt/etc/opkg.conf
+fi
 
 poweroff
 EOF
+
 arm_now start --autostart autostart.sh --sync
 # openssl-util

From 1bfa04fbf4cd23583f34e25b1c96a0e2a7796ebf Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Sat, 2 Jun 2018 22:07:25 +0200
Subject: [PATCH 21/34] default arch

---
 arm_now/arm_now.py          | 5 ++++-
 arm_now/config.py           | 1 +
 preconfigure.sh             | 7 ++++---
 test-run.sh => reinstall.sh | 0
 4 files changed, 9 insertions(+), 4 deletions(-)
 rename test-run.sh => reinstall.sh (100%)

diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index af8652a..3fa683f 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -39,9 +39,13 @@
 """
 
 from docopt import docopt
+import os
 
 def main():
     a = docopt(__doc__, version='arm_now 1.2')
+    if not a["<arch>"] and os.path.isfile(Config.ARCH):
+        with open(Config.ARCH) as F:
+            a["<arch>"] = F.read()
     if a["list"]:
         do_list(a["--all"])
     elif a["start"]:
@@ -62,7 +66,6 @@ def main():
 import requests
 import sys
 import re
-import os
 from multiprocessing import Pool
 from collections import defaultdict
 from pprint import pprint
diff --git a/arm_now/config.py b/arm_now/config.py
index b1df6b7..b3a7e6d 100644
--- a/arm_now/config.py
+++ b/arm_now/config.py
@@ -3,6 +3,7 @@ class Config:
     KERNEL = DIR + "kernel"
     DTB = DIR + "dtb"
     ROOTFS = DIR + "rootfs.ext2"
+    ARCH = DIR + "arch"
     DOWNLOAD_CACHE_DIR = "/tmp/arm_now"
 
 qemu_options = {
diff --git a/preconfigure.sh b/preconfigure.sh
index 675d971..e72680a 100755
--- a/preconfigure.sh
+++ b/preconfigure.sh
@@ -2,12 +2,13 @@ cd ../
 rm -rf preconfig
 mkdir preconfig
 cd preconfig
-arm_now clean
+arm_now install --clean
+arm_now resize 200M
 mkdir cacert
 cd cacert
 curl https://curl.haxx.se/ca/cacert.pem | awk 'split_after==1{n++;split_after=0} /-----END CERTIFICATE-----/ {split_after=1} {print > "cert" n ".pem"}'
 cd -
-cat <<EOF>>autostart.sh
+cat <<EOF>>config_ssl.sh
 cd /root
 if [[ -e ./install_pkg_manager.sh ]]
 then
@@ -31,5 +32,5 @@ fi
 poweroff
 EOF
 
-arm_now start --autostart autostart.sh --sync
+arm_now start --autostart config_ssl.sh --sync
 # openssl-util
diff --git a/test-run.sh b/reinstall.sh
similarity index 100%
rename from test-run.sh
rename to reinstall.sh

From 043a7fa02584516ce46009b39f898b63c4ab3721 Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Sat, 2 Jun 2018 22:14:59 +0200
Subject: [PATCH 22/34] add show command

---
 arm_now/arm_now.py | 57 ++++++++++++++++++++++++++++------------------
 preconfigure.sh    |  2 +-
 2 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index 3fa683f..446fb74 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -18,6 +18,7 @@
   resize        Resize the current rootfs. (example: resize 1G)
   clean         Delete the current rootfs.
   install       Install and config a rootfs for the given <arch>. (default: armv5-eabi)
+  show          Show informations about the rootfs.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Options:
   --sync                        Synchronize the current directory with the vm home.
@@ -38,8 +39,29 @@
   arch          Defaults to armv5-eabi.
 """
 
-from docopt import docopt
 import os
+import urllib.request
+import requests
+import sys
+import re
+from multiprocessing import Pool
+from collections import defaultdict
+from pprint import pprint
+import shutil
+import contextlib
+import operator
+import subprocess
+import platform
+import tempfile
+import re
+
+from docopt import docopt
+from exall import exall, ignore, print_warning, print_traceback, print_error
+
+from .utils import *
+from .filesystem import *
+from .config import *
+from . import options
 
 def main():
     a = docopt(__doc__, version='arm_now 1.2')
@@ -59,30 +81,11 @@ def main():
         do_resize(a["<new_size>"], a["--correct"])
     elif a["install"]:
         do_install(a["<arch>"] or "armv5-eabi", a["--clean"])
+    elif a["show"]:
+        do_show()
 
 #  ================ End Argument Parsing ==============================
 
-import urllib.request
-import requests
-import sys
-import re
-from multiprocessing import Pool
-from collections import defaultdict
-from pprint import pprint
-import shutil
-import contextlib
-import operator
-import subprocess
-import platform
-import tempfile
-import re
-
-from .utils import *
-from .filesystem import *
-from .config import *
-from . import options
-from exall import exall, ignore, print_warning, print_traceback, print_error
-
 def indexof_parse(url):
     re_href = re.compile('\[DIR\].*href="?([^ <>"]*)"?')
     response = requests.get(url)
@@ -330,5 +333,15 @@ def do_list(all=False):
         p = Pool(10)
         ret = p.map(test_arch, all_arch)
 
+def do_show():
+    if not os.path.isfile(Config.ARCH) or not os.path.isfile(Config.ROOTFS):
+        pred("File missing")
+        return
+    with open(Config.ARCH) as F:
+        arch = F.read()
+    size = os.path.getsize(Config.ROOTFS)
+    pgreen("arch         = {}".format(arch))
+    pgreen("rootfs size  = {}M".format(size // 1024))
+
 if __name__ == "__main__":
     main()
diff --git a/preconfigure.sh b/preconfigure.sh
index e72680a..34c3406 100755
--- a/preconfigure.sh
+++ b/preconfigure.sh
@@ -2,7 +2,7 @@ cd ../
 rm -rf preconfig
 mkdir preconfig
 cd preconfig
-arm_now install --clean
+arm_now install x86-i686 --clean
 arm_now resize 200M
 mkdir cacert
 cd cacert

From 346cac183e64a7599617c55347577d4f3d32c196 Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Sat, 2 Jun 2018 23:58:28 +0200
Subject: [PATCH 23/34] size in M

---
 Changelog.txt      |  7 +++++++
 arm_now/arm_now.py |  9 ++++++++-
 preconfigure.sh    | 21 +++++++++++++++------
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index dae90ab..2370646 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -30,13 +30,20 @@ Correct --resize
 Fix bug with trying to sync big files
 Migrate from clize to docopt
 Refactor utils functions
+Refactor filesystem, config, options functions
 Disable audio to gain boot speed
 Add colors
 Add -add-qemu-options
+Add show command
 
 
 TODO:
 Add a new features sections
+	autostart
+	resize
+	show
+	https
+
 find binary-samples/ -type f |tee filelist | e2cp -apv -d arm_now/rootfs.ext2:/
 10.0.2.2 is the host ip
 use mkisofs or genisoimage to create an iso from a folder. 
diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index 446fb74..af7adff 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -9,6 +9,7 @@
   arm_now clean
   arm_now resize <new_size> [--correct]
   arm_now install [<arch>] [--clean]
+  arm_now show
   arm_now -h | --help
   arm_now --version
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -339,9 +340,15 @@ def do_show():
         return
     with open(Config.ARCH) as F:
         arch = F.read()
+    print(" Info ".center(80, "~"))
     size = os.path.getsize(Config.ROOTFS)
     pgreen("arch         = {}".format(arch))
-    pgreen("rootfs size  = {}M".format(size // 1024))
+    pgreen("rootfs size  = {}M".format(size // (1024 * 1024) ))
+    ls_cmd = ["e2ls", Config.ROOTFS + ":/root"]
+    print((" " + " ".join(ls_cmd) + " ").center(80, "~"))
+    subprocess.check_call(ls_cmd)
+    print("~" * 80)
+
 
 if __name__ == "__main__":
     main()
diff --git a/preconfigure.sh b/preconfigure.sh
index 34c3406..3e1e90e 100755
--- a/preconfigure.sh
+++ b/preconfigure.sh
@@ -2,12 +2,12 @@ cd ../
 rm -rf preconfig
 mkdir preconfig
 cd preconfig
-arm_now install x86-i686 --clean
+arm_now install x86-core2 --clean
 arm_now resize 200M
-mkdir cacert
-cd cacert
-curl https://curl.haxx.se/ca/cacert.pem | awk 'split_after==1{n++;split_after=0} /-----END CERTIFICATE-----/ {split_after=1} {print > "cert" n ".pem"}'
-cd -
+# mkdir cacert
+# cd cacert
+# curl https://curl.haxx.se/ca/cacert.pem | awk 'split_after==1{n++;split_after=0} /-----END CERTIFICATE-----/ {split_after=1} {print > "cert" n ".pem"}'
+# cd -
 cat <<EOF>>config_ssl.sh
 cd /root
 if [[ -e ./install_pkg_manager.sh ]]
@@ -27,10 +27,19 @@ then
   rm /usr/bin/wget
   sed 's/http:/https:/g' /opt/etc/opkg.conf > /opt/etc/opkg.conf.bak
   mv /opt/etc/opkg.conf.bak /opt/etc/opkg.conf
+
+  ######## 
+  # opkg install git
+  # opkg install git-http
+  # opkg install python3
+# pip3 install requests
+# pip3 install urllib3
+# pip3 install chardet
+# pip3 install certifi
+
 fi
 
 poweroff
 EOF
 
 arm_now start --autostart config_ssl.sh --sync
-# openssl-util

From 8af5dfd333749189d2dad34ad3da0520d9b0a640 Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Sun, 3 Jun 2018 14:33:18 +0200
Subject: [PATCH 24/34] refactor download

---
 Changelog.txt         |   5 ++
 arm_now/arm_now.py    | 158 ++++++++++--------------------------------
 arm_now/config.py     |   1 -
 arm_now/download.py   |  56 +++++++++++++++
 arm_now/filesystem.py |  57 +++++++++++----
 arm_now/options.py    |  14 +++-
 preconfigure.sh       |  28 +++++---
 7 files changed, 170 insertions(+), 149 deletions(-)
 create mode 100644 arm_now/download.py

diff --git a/Changelog.txt b/Changelog.txt
index 2370646..1734afb 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -43,6 +43,11 @@ Add a new features sections
 	resize
 	show
 	https
+	full support of ext4
+	Package manager is preinstalled
+
+	we can share drive like this:
+arm_now start x86-core2 --add-qemu-options "-machine usb=on -usb -usbdevice disk:empty-ext3-2GB.img"
 
 find binary-samples/ -type f |tee filelist | e2cp -apv -d arm_now/rootfs.ext2:/
 10.0.2.2 is the host ip
diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index af7adff..58264ab 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -60,11 +60,16 @@
 from exall import exall, ignore, print_warning, print_traceback, print_error
 
 from .utils import *
-from .filesystem import *
-from .config import *
+from filesystem import Filesystem
+from .config import Config, qemu_options, install_opkg
 from . import options
+from .download import download, scrawl_kernel
 
 def main():
+    """ Call the function according to the asked command
+        Read above to acknowledge supported commands
+    """
+    check_dependencies_or_exit()
     a = docopt(__doc__, version='arm_now 1.2')
     if not a["<arch>"] and os.path.isfile(Config.ARCH):
         with open(Config.ARCH) as F:
@@ -87,64 +92,27 @@ def main():
 
 #  ================ End Argument Parsing ==============================
 
-def indexof_parse(url):
-    re_href = re.compile('\[DIR\].*href="?([^ <>"]*)"?')
-    response = requests.get(url)
-    text = response.text
-    links = re_href.findall(text)
-    return links
-
-libc = ["uclibc", "glibc", "musl"]
-def get_link_libc(link):
-    for i_libc in libc:
-        if i_libc in link:
-            return i_libc
-    return None
-
-def get_link_version(link):
-    if "bleeding-edge" in link:
-        return "bleeding-edge"
-    else:
-        return "stable"
-
-def get_link_filetype(link):
-    if ".cpio" in link or ".ext2" in link or "rootfs" in link:
-        return "rootfs"
-    elif "dtb" in link:
-        return "dtb"
-    elif "Image" in link or "vmlinux" in link or "linux.bin" in link:
-        return "kernel"
-    print("ERROR: I don't know this kind of file {}".format(link), file=sys.stderr)
-    # os.kill(0, 9)
-    return None
-
-def scrawl_kernel(arch):
-    re_href = re.compile('href="?({arch}[^ <>"]*)"?'.format(arch=arch))
-    url = "https://toolchains.bootlin.com/downloads/releases/toolchains/{arch}/test-system/".format(arch=arch)
-    response = requests.get(url + "?C=M;O=D")
-    text = response.text
-    links = re_href.findall(text)
-    links_dict = defaultdict(lambda : defaultdict(dict))
-    for link in links:
-        version = get_link_version(link)
-        libc = get_link_libc(link)
-        filetype = get_link_filetype(link)
+def do_start(arch, clean, sync, offline, redir, add_qemu_options, autostart):
+    """Setup and start a virtualmachine using qemu.
 
-        # TODO: make sure they have been compiled at the same time
-        if filetype not in links_dict[version][libc]:
-            if filetype is None:
-                return None, None, None
-            links_dict[version][libc][filetype] = url + link
-    state = "stable" if "stable" in links_dict else "bleeding-edge"
-    libc = "uclibc" if "uclibc" in links_dict[state] else None
-    libc = "musl" if "musl" in links_dict[state] else libc
-    libc = "glibc" if "glibc" in links_dict[state] else libc
-    dtb = None if "dtb" not in links_dict[state][libc] else links_dict[state][libc]["dtb"]
-    rootfs = None if "rootfs" not in links_dict[state][libc] else links_dict[state][libc]["rootfs"]
-    kernel = None if "kernel" not in links_dict[state][libc] else links_dict[state][libc]["kernel"]
-    return kernel, dtb, rootfs
+    :param arch: The cpu architecture that will be started.
+    :param redir: Redirect a host port to the guest.
+    :param offline: skip the checks for new images.
+    :param clean: Clean filesystem before starting.
+    :param sync: Sync le current directory with the guest.
+    """
+    add_qemu_options += " " + convert_redir_to_qemu_args(redir)
+    fs = Filesystem(Config.ROOTFS)
+    if clean: option.clean(Config)
+    if not offline: do_install(arch)
+    config_filesystem(Config.ROOTFS, arch)
+    if sync: options.sync_upload(Config.ROOTFS, src=".", dest="/root")
+    options.autostart(Config.ROOTFS, autostart)
+    run_qemu(arch, Config.KERNEL, Config.DTB, Config.ROOTFS, add_qemu_options)
+    fs.check()
+    if sync: options.sync_download(Config.ROOTFS, "/root.tar", ".")
 
-def run(arch, kernel, dtb, rootfs, add_qemu_options):
+def run_qemu(arch, kernel, dtb, rootfs, add_qemu_options):
     dtb = "" if not os.path.exists(dtb) else "-dtb {}".format(dtb)
     options = qemu_options[arch][1].format(arch=arch, kernel=kernel, rootfs=rootfs, dtb=dtb)
     arch = qemu_options[arch][0]
@@ -171,7 +139,6 @@ def is_already_created(arch):
         old_arch = F.read()
     if old_arch == arch:
         return True
-    # response = input("(use --clean next time) Current directory contains a different arch ({}), delete ? (y/n) ".format(old_arch))
     response = input("(use --clean next time) An {} image exists, delete ? (y/n) ".format(old_arch))
     if not response.startswith("y"):
         sys.exit(1)
@@ -183,7 +150,7 @@ def do_install(arch, clean=False):
     """
     if clean: options.clean(Config)
     if arch not in qemu_options:
-        pred("ERROR: I don't know this arch yet", file=sys.stderr)
+        pred("ERROR: I don't know this arch='{}' yet".format(arch), file=sys.stderr)
         porange("maybe you meant: {}".format(maybe_you_meant(arch, qemu_options.keys()) or qemu_options.keys()), file=sys.stderr)
         sys.exit(1)
     kernel, dtb, rootfs = scrawl_kernel(arch)
@@ -196,12 +163,11 @@ def do_install(arch, clean=False):
     with contextlib.suppress(FileExistsError):
         os.mkdir(Config.DIR)
     download(kernel, Config.KERNEL, Config.DOWNLOAD_CACHE_DIR)
-    if dtb:
-        download(dtb, Config.DTB, Config.DOWNLOAD_CACHE_DIR)
+    if dtb: download(dtb, Config.DTB, Config.DOWNLOAD_CACHE_DIR)
     download(rootfs, Config.ROOTFS, Config.DOWNLOAD_CACHE_DIR)
     with open(Config.DIR + "/arch", "w") as F:
         F.write(arch)
-    print("[+] Installed")
+    pgreen("[+] Installed")
 
 
 def config_filesystem(rootfs, arch):
@@ -232,19 +198,7 @@ def config_filesystem(rootfs, arch):
                 """, right=555)
     fs.sed('s/init.d\/S/init.d\/K/g', '/etc/init.d/rcK', right=755)
 
-@exall(subprocess.check_call, subprocess.CalledProcessError, print_warning)
-def get_local_files(rootfs, src, dest):
-    fs = Filesystem(rootfs)
-    if not fs.implemented():
-        return
-    fs.get(src, dest)
-    if os.path.exists("root.tar"):
-        subprocess.check_call("tar xf root.tar".split(' '))
-        os.unlink("root.tar")
-    else:
-        pgreen("Use the 'save' command before exiting the vm to retrieve all files on the host")
-
-def check_dependencies():
+def check_dependencies_or_exit():
     dependencies = [
             which("e2cp", ubuntu="apt-get install e2tools", arch="yaourt -S e2tools"),
             which("qemu-system-arm", ubuntu="apt-get install qemu", arch="yaourt -S qemu-arch-extra")
@@ -253,11 +207,8 @@ def check_dependencies():
         print("requirements missing, plz install them", file=sys.stderr)
         sys.exit(1)
 
-def test():
-    get_local_files("./arm_now/rootfs.ext2", "/root.tar", ".")
-
 re_redir = re.compile(r"(tcp|udp):\d+::\d+")
-def parse_redir(redir):
+def convert_redir_to_qemu_args(redir):
     qemu_redir = []
     for r in redir:
         if not re_redir.match(r):
@@ -268,54 +219,15 @@ def parse_redir(redir):
             sys.exit(1)
     return ''.join(map("-redir {} ".format, redir))
 
-def do_start(arch, clean, sync, offline, redir, add_qemu_options, autostart):
-    """Setup and start a virtualmachine using qemu.
-
-    :param arch: The cpu architecture that will be started.
-    :param redir: Redirect a host port to the guest.
-    :param offline: skip the checks for new images.
-    :param clean: Clean filesystem before starting.
-    :param sync: Sync le current directory with the guest.
-    """
-    redir = parse_redir(redir)
-    add_qemu_options += " " + redir
-    print("o" * 40)
-    print(add_qemu_options)
-    if not arch:
-        print("Supported architectures:")
-        print(list_arch())
-        pred("ERROR: no arch specified")
-        sys.exit(1)
-    check_dependencies()
-    if clean: option.clean(Config)
-    if not offline:
-        do_install(arch)
-        config_filesystem(Config.ROOTFS, arch)
-    if sync: options.sync(Config.ROOTFS, src=".", dest="/root")
-    options.autostart(Config.ROOTFS, autostart)
-
-    run(arch, Config.KERNEL, Config.DTB, Config.ROOTFS, add_qemu_options)
-    try:
-        print(" Checking the filesystem ".center(80, "+"))
-        subprocess.check_call(["e2fsck", "-vfy", Config.ROOTFS])
-    except subprocess.CalledProcessError as e:
-        print(e)
-        if str(e).find("returned non-zero exit status 1."):
-            porange("It's ok but next time poweroff")
-    if sync:
-        get_local_files(Config.ROOTFS, "/root.tar", ".")
 
+@exall(subprocess.check_call, subprocess.CalledProcessError, print_error)
 def do_resize(size, correct):
     """ Resize filesystem.
     """
-    subprocess.check_call(["qemu-img", "resize", Config.ROOTFS, size])
-    subprocess.check_call(["e2fsck", "-fy", Config.ROOTFS])
-    subprocess.check_call(["resize2fs", Config.ROOTFS])
-    subprocess.check_call(["ls", "-lh", Config.ROOTFS])
-    pgreen("[+] Resized to {size}".format(size=size))
+    fs = Filesystem(Config.ROOTFS)
+    fs.resize(size)
     if correct:
-        porange("[+] Correcting ... (be patient)".format(size=size))
-        subprocess.check_call("mke2fs -F -b 1024 -m 0 -g 272".split() + [Config.ROOTFS])
+        fs.correct()
 
 def test_arch(arch):
     arch = arch[:-1]
diff --git a/arm_now/config.py b/arm_now/config.py
index b3a7e6d..c9c82f8 100644
--- a/arm_now/config.py
+++ b/arm_now/config.py
@@ -49,4 +49,3 @@ class Config:
         "x86-core2":"""wget -O - http://pkg.entware.net/binaries/x86-32/installer/entware_install.sh | /bin/sh""",
         "x86-i686":"""wget -O - http://pkg.entware.net/binaries/x86-32/installer/entware_install.sh | /bin/sh""",
 }
-
diff --git a/arm_now/download.py b/arm_now/download.py
new file mode 100644
index 0000000..f1acf84
--- /dev/null
+++ b/arm_now/download.py
@@ -0,0 +1,56 @@
+def indexof_parse(url):
+    re_href = re.compile('\[DIR\].*href="?([^ <>"]*)"?')
+    response = requests.get(url)
+    text = response.text
+    links = re_href.findall(text)
+    return links
+
+libc = ["uclibc", "glibc", "musl"]
+def get_link_libc(link):
+    for i_libc in libc:
+        if i_libc in link:
+            return i_libc
+    return None
+
+def get_link_version(link):
+    if "bleeding-edge" in link:
+        return "bleeding-edge"
+    else:
+        return "stable"
+
+def get_link_filetype(link):
+    if ".cpio" in link or ".ext2" in link or "rootfs" in link:
+        return "rootfs"
+    elif "dtb" in link:
+        return "dtb"
+    elif "Image" in link or "vmlinux" in link or "linux.bin" in link:
+        return "kernel"
+    print("ERROR: I don't know this kind of file {}".format(link), file=sys.stderr)
+    # os.kill(0, 9)
+    return None
+
+def scrawl_kernel(arch):
+    re_href = re.compile('href="?({arch}[^ <>"]*)"?'.format(arch=arch))
+    url = "https://toolchains.bootlin.com/downloads/releases/toolchains/{arch}/test-system/".format(arch=arch)
+    response = requests.get(url + "?C=M;O=D")
+    text = response.text
+    links = re_href.findall(text)
+    links_dict = defaultdict(lambda : defaultdict(dict))
+    for link in links:
+        version = get_link_version(link)
+        libc = get_link_libc(link)
+        filetype = get_link_filetype(link)
+
+        # TODO: make sure they have been compiled at the same time
+        if filetype not in links_dict[version][libc]:
+            if filetype is None:
+                return None, None, None
+            links_dict[version][libc][filetype] = url + link
+    state = "stable" if "stable" in links_dict else "bleeding-edge"
+    libc = "uclibc" if "uclibc" in links_dict[state] else None
+    libc = "musl" if "musl" in links_dict[state] else libc
+    libc = "glibc" if "glibc" in links_dict[state] else libc
+    dtb = None if "dtb" not in links_dict[state][libc] else links_dict[state][libc]["dtb"]
+    rootfs = None if "rootfs" not in links_dict[state][libc] else links_dict[state][libc]["rootfs"]
+    kernel = None if "kernel" not in links_dict[state][libc] else links_dict[state][libc]["kernel"]
+    return kernel, dtb, rootfs
diff --git a/arm_now/filesystem.py b/arm_now/filesystem.py
index ed07d81..6a799f9 100644
--- a/arm_now/filesystem.py
+++ b/arm_now/filesystem.py
@@ -6,21 +6,16 @@
 from exall import exall, ignore, print_warning, print_traceback, print_error
 from .utils import *
 
-# def ext2_write_to_file(rootfs, dest, script):
-#     with tempfile.TemporaryDirectory() as tmpdirname:
-#         filename = tmpdirname + "/script"
-#         with open(filename, "w") as F:
-#             F.write(script)
-#         subprocess.check_call("e2cp -G 0 -O 0 -P 555".split(' ') + [filename, rootfs + ":" + dest])
-
-
 def Filesystem(path):
     filemagic = magic.from_file(path)
-    if "ext2" in filemagic:
-        return Ext2(path)
-    return UnknownFileSystem(path, filemagic)
-
-class Ext2:
+    if "ext2" in filemagic or "ext4" in filemagic:
+        return Ext2_Ext4(path)
+    if "cpio" in filemagic:
+        return Cpio(path)
+    pred("UnknownFileSystem {}".format(filemagic))
+    sys.exit(1)
+
+class Ext2_Ext4:
     def __init__(self, path):
         self.rootfs = path
 
@@ -61,10 +56,30 @@ def sed(self, regex, path, right=444):
                 regex=regex, new=new, old=old), shell=True)
             self.put(new, path, right=right)
 
-class UnknownFileSystem:
+    @exall(subprocess.check_call, subprocess.CalledProcessError, print_error)
+    def resize(self, size):
+        subprocess.check_call(["qemu-img", "resize", self.rootfs, size])
+        subprocess.check_call(["e2fsck", "-fy", self.rootfs])
+        subprocess.check_call(["resize2fs", self.rootfs])
+        subprocess.check_call(["ls", "-lh", self.rootfs])
+        pgreen("[+] Resized to {size}".format(size=size))
+
+    def correct(self):
+        porange("[+] Correcting ... (be patient)".format(size=size))
+        subprocess.check_call("mke2fs -F -b 1024 -m 0 -g 272".split() + [Config.ROOTFS])
+
+    def check(self):
+        try:
+            print(" Checking the filesystem ".center(80, "+"))
+            subprocess.check_call(["e2fsck", "-vfy", self.rootfs])
+        except subprocess.CalledProcessError as e:
+            print(e)
+            if str(e).find("returned non-zero exit status 1."):
+                porange("It's ok but next time poweroff")
+
+class Cpio:
     def __init__(self, path, filemagic):
         self.rootfs = path
-        porange("UnknownFileSystem({}, {})".format(path, filemagic))
 
     def implemented(self):
         return False
@@ -86,3 +101,15 @@ def create(self, dest, content, right=444):
 
     def sed(self, regex, path, right=444):
         porange("sed is not implented for {}".format(self.rootfs))
+
+    @exall(subprocess.check_call, subprocess.CalledProcessError, print_error)
+    def resize(self, size):
+        subprocess.check_call(["qemu-img", "resize", self.rootfs, size])
+        subprocess.check_call(["ls", "-lh", self.rootfs])
+        pgreen("[+] Resized to {size}".format(size=size))
+
+    def correct(self, regex, path, right=444):
+        porange("correct is not implented for {}".format(self.rootfs))
+
+    def check(self):
+        porange("check is not implented for {}".format(self.rootfs))
diff --git a/arm_now/options.py b/arm_now/options.py
index b04ae75..677baae 100644
--- a/arm_now/options.py
+++ b/arm_now/options.py
@@ -20,7 +20,7 @@ def autostart(rootfs, script):
     else:
         fs.rm("/etc/init.d/S90_user_autostart")
 
-def sync(rootfs, src, dest):
+def sync_upload(rootfs, src, dest):
     fs = Filesystem(rootfs)
     if not fs.implemented():
         return
@@ -44,3 +44,15 @@ def sync(rootfs, src, dest):
                 tar cf /root.tar *
                 sync
                 """.format(dest=dest), right=555)
+
+@exall(subprocess.check_call, subprocess.CalledProcessError, print_warning)
+def sync_download(rootfs, src, dest):
+    fs = Filesystem(rootfs)
+    if not fs.implemented():
+        return
+    fs.get(src, dest)
+    if os.path.exists("root.tar"):
+        subprocess.check_call("tar xf root.tar".split(' '))
+        os.unlink("root.tar")
+    else:
+        pgreen("Use the 'save' command before exiting the vm to retrieve all files on the host")
diff --git a/preconfigure.sh b/preconfigure.sh
index 3e1e90e..7ad603a 100755
--- a/preconfigure.sh
+++ b/preconfigure.sh
@@ -2,13 +2,18 @@ cd ../
 rm -rf preconfig
 mkdir preconfig
 cd preconfig
-arm_now install x86-core2 --clean
-arm_now resize 200M
-# mkdir cacert
-# cd cacert
-# curl https://curl.haxx.se/ca/cacert.pem | awk 'split_after==1{n++;split_after=0} /-----END CERTIFICATE-----/ {split_after=1} {print > "cert" n ".pem"}'
-# cd -
-cat <<EOF>>config_ssl.sh
+for arch in $(arm_now list)
+do
+  echo arch ARCH="$arch"
+  arm_now install "$arch" --clean
+  arm_now resize 100M
+  echo "Resize ok ?"
+  # read
+  # mkdir cacert
+  # cd cacert
+  # curl https://curl.haxx.se/ca/cacert.pem | awk 'split_after==1{n++;split_after=0} /-----END CERTIFICATE-----/ {split_after=1} {print > "cert" n ".pem"}'
+  # cd -
+  cat <<EOF>>config_ssl.sh
 cd /root
 if [[ -e ./install_pkg_manager.sh ]]
 then
@@ -41,5 +46,10 @@ fi
 
 poweroff
 EOF
-
-arm_now start --autostart config_ssl.sh --sync
+  e2ls arm_now/rootfs.ext2:/root | grep install
+  RET="$?"
+  if [[ "$RET" == "0" ]]; then
+    arm_now start --autostart config_ssl.sh
+  fi
+  tar -Jcf "$(cat arm_now/arch).tar.xz" arm_now/
+done

From 5d269839df7e62f0d3fcb95a951ad3d5f98a6c89 Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Sun, 3 Jun 2018 15:18:21 +0200
Subject: [PATCH 25/34] unit test

---
 arm_now/arm_now.py    |   9 +---
 arm_now/download.py   |  82 ++++++++++++++++++++++-----------
 arm_now/filesystem.py | 104 ++++++++++++++++++++++++++++++++++++++++--
 arm_now/utils.py      |  25 ----------
 preconfigure.sh       |   6 +--
 5 files changed, 161 insertions(+), 65 deletions(-)

diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index 58264ab..80db24f 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -57,10 +57,9 @@
 import re
 
 from docopt import docopt
-from exall import exall, ignore, print_warning, print_traceback, print_error
 
 from .utils import *
-from filesystem import Filesystem
+from .filesystem import Filesystem
 from .config import Config, qemu_options, install_opkg
 from . import options
 from .download import download, scrawl_kernel
@@ -220,7 +219,6 @@ def convert_redir_to_qemu_args(redir):
     return ''.join(map("-redir {} ".format, redir))
 
 
-@exall(subprocess.check_call, subprocess.CalledProcessError, print_error)
 def do_resize(size, correct):
     """ Resize filesystem.
     """
@@ -256,11 +254,8 @@ def do_show():
     size = os.path.getsize(Config.ROOTFS)
     pgreen("arch         = {}".format(arch))
     pgreen("rootfs size  = {}M".format(size // (1024 * 1024) ))
-    ls_cmd = ["e2ls", Config.ROOTFS + ":/root"]
-    print((" " + " ".join(ls_cmd) + " ").center(80, "~"))
-    subprocess.check_call(ls_cmd)
+    Filesystem(Config.ROOTFS).ls("/root")
     print("~" * 80)
 
-
 if __name__ == "__main__":
     main()
diff --git a/arm_now/download.py b/arm_now/download.py
index f1acf84..2110e0c 100644
--- a/arm_now/download.py
+++ b/arm_now/download.py
@@ -1,3 +1,59 @@
+import os
+import re
+import requests
+import shutil
+from collections import defaultdict
+
+# Exall is an exception manager based on decorator/context/callback
+# Check it out: https://github.com/nongiach/exall
+from exall import exall, ignore, print_warning, print_traceback, print_error
+from pySmartDL import SmartDL
+
+@exall(os.mkdir, FileExistsError, ignore)
+def download(url, filename, cache_directory):
+    print("\nDownloading {} from {}".format(filename, url))
+    filename_cache = url.split('/')[-1]
+    filename_cache = ''.join([ c for c in filename_cache if c.isdigit() or c.isalpha() ])
+    filename_cache = cache_directory + "/" + filename_cache
+    print(filename_cache)
+    if os.path.exists(filename):
+        print("Filexists")
+    elif os.path.exists(filename_cache):
+        print("Already downloaded")
+        shutil.copyfile(filename_cache, filename)
+    else:
+        os.mkdir(cache_directory)
+        # wget.download(url, out=filename_cache)
+        obj = SmartDL(url, filename_cache)
+        obj.start()
+        shutil.copyfile(filename_cache, filename)
+
+def scrawl_kernel(arch):
+    re_href = re.compile('href="?({arch}[^ <>"]*)"?'.format(arch=arch))
+    url = "https://toolchains.bootlin.com/downloads/releases/toolchains/{arch}/test-system/".format(arch=arch)
+    response = requests.get(url + "?C=M;O=D")
+    text = response.text
+    links = re_href.findall(text)
+    links_dict = defaultdict(lambda : defaultdict(dict))
+    for link in links:
+        version = get_link_version(link)
+        libc = get_link_libc(link)
+        filetype = get_link_filetype(link)
+
+        # TODO: make sure they have been compiled at the same time
+        if filetype not in links_dict[version][libc]:
+            if filetype is None:
+                return None, None, None
+            links_dict[version][libc][filetype] = url + link
+    state = "stable" if "stable" in links_dict else "bleeding-edge"
+    libc = "uclibc" if "uclibc" in links_dict[state] else None
+    libc = "musl" if "musl" in links_dict[state] else libc
+    libc = "glibc" if "glibc" in links_dict[state] else libc
+    dtb = None if "dtb" not in links_dict[state][libc] else links_dict[state][libc]["dtb"]
+    rootfs = None if "rootfs" not in links_dict[state][libc] else links_dict[state][libc]["rootfs"]
+    kernel = None if "kernel" not in links_dict[state][libc] else links_dict[state][libc]["kernel"]
+    return kernel, dtb, rootfs
+
 def indexof_parse(url):
     re_href = re.compile('\[DIR\].*href="?([^ <>"]*)"?')
     response = requests.get(url)
@@ -28,29 +84,3 @@ def get_link_filetype(link):
     print("ERROR: I don't know this kind of file {}".format(link), file=sys.stderr)
     # os.kill(0, 9)
     return None
-
-def scrawl_kernel(arch):
-    re_href = re.compile('href="?({arch}[^ <>"]*)"?'.format(arch=arch))
-    url = "https://toolchains.bootlin.com/downloads/releases/toolchains/{arch}/test-system/".format(arch=arch)
-    response = requests.get(url + "?C=M;O=D")
-    text = response.text
-    links = re_href.findall(text)
-    links_dict = defaultdict(lambda : defaultdict(dict))
-    for link in links:
-        version = get_link_version(link)
-        libc = get_link_libc(link)
-        filetype = get_link_filetype(link)
-
-        # TODO: make sure they have been compiled at the same time
-        if filetype not in links_dict[version][libc]:
-            if filetype is None:
-                return None, None, None
-            links_dict[version][libc][filetype] = url + link
-    state = "stable" if "stable" in links_dict else "bleeding-edge"
-    libc = "uclibc" if "uclibc" in links_dict[state] else None
-    libc = "musl" if "musl" in links_dict[state] else libc
-    libc = "glibc" if "glibc" in links_dict[state] else libc
-    dtb = None if "dtb" not in links_dict[state][libc] else links_dict[state][libc]["dtb"]
-    rootfs = None if "rootfs" not in links_dict[state][libc] else links_dict[state][libc]["rootfs"]
-    kernel = None if "kernel" not in links_dict[state][libc] else links_dict[state][libc]["kernel"]
-    return kernel, dtb, rootfs
diff --git a/arm_now/filesystem.py b/arm_now/filesystem.py
index 6a799f9..a27c6fb 100644
--- a/arm_now/filesystem.py
+++ b/arm_now/filesystem.py
@@ -1,6 +1,8 @@
 import subprocess
 import tempfile
 import os
+import sys
+import tempfile
 
 import magic
 from exall import exall, ignore, print_warning, print_traceback, print_error
@@ -9,15 +11,18 @@
 def Filesystem(path):
     filemagic = magic.from_file(path)
     if "ext2" in filemagic or "ext4" in filemagic:
-        return Ext2_Ext4(path)
+        return Ext2_Ext4(path, filemagic)
     if "cpio" in filemagic:
-        return Cpio(path)
+        return Cpio(path, filemagic)
+    if "tar" in filemagic:
+        return Tar(path, filemagic)
     pred("UnknownFileSystem {}".format(filemagic))
     sys.exit(1)
 
 class Ext2_Ext4:
-    def __init__(self, path):
+    def __init__(self, path, filemagic):
         self.rootfs = path
+        self.filemagic = filemagic
 
     def implemented(self):
         return True
@@ -64,6 +69,7 @@ def resize(self, size):
         subprocess.check_call(["ls", "-lh", self.rootfs])
         pgreen("[+] Resized to {size}".format(size=size))
 
+    @exall(subprocess.check_call, subprocess.CalledProcessError, print_error)
     def correct(self):
         porange("[+] Correcting ... (be patient)".format(size=size))
         subprocess.check_call("mke2fs -F -b 1024 -m 0 -g 272".split() + [Config.ROOTFS])
@@ -77,8 +83,13 @@ def check(self):
             if str(e).find("returned non-zero exit status 1."):
                 porange("It's ok but next time poweroff")
 
+    def ls(self, path):
+        ls_cmd = ["e2ls", self.rootfs + ":" + path]
+        print((" " + " ".join(ls_cmd) + " ").center(80, "~"))
+        subprocess.check_call(ls_cmd)
+
 class Cpio:
-    def __init__(self, path, filemagic):
+    def __init__(self, path):
         self.rootfs = path
 
     def implemented(self):
@@ -113,3 +124,88 @@ def correct(self, regex, path, right=444):
 
     def check(self):
         porange("check is not implented for {}".format(self.rootfs))
+
+    def ls(self, path):
+        porange("ls is not implented for {}".format(self.rootfs))
+
+class Cpio:
+    def __init__(self, path, filemagic):
+        self.rootfs = path
+        self.filemagic = filemagic
+
+    def implemented(self):
+        return False
+
+    def __call__(self, t):
+        pred("__CALL__ {}".format(t))
+
+    def put(self, src, dest, right=444):
+        porange("put is not implented for {}".format(self.filemagic))
+
+    def get(self, src, dest):
+        porange("get is not implented for {}".format(self.filemagic))
+
+    def rm(self, filename, on_error=print_error):
+        porange("rm is not implented for {}".format(self.filemagic))
+
+    def create(self, dest, content, right=444):
+        porange("create is not implented for {}".format(self.filemagic))
+
+    def sed(self, regex, path, right=444):
+        porange("sed is not implented for {}".format(self.filemagic))
+
+    @exall(subprocess.check_call, subprocess.CalledProcessError, print_error)
+    def resize(self, size):
+        subprocess.check_call(["qemu-img", "resize", self.rootfs, size])
+        subprocess.check_call(["ls", "-lh", self.rootfs])
+        pgreen("[+] Resized to {size}".format(size=size))
+
+    def correct(self, regex, path, right=444):
+        porange("correct is not implented for {}".format(self.filemagic))
+
+    def check(self):
+        porange("check is not implented for {}".format(self.filemagic))
+
+    def ls(self, path):
+        porange("ls is not implented for {}".format(self.filemagic))
+
+class Tar:
+    def __init__(self, path, filemagic):
+        self.rootfs = path
+        self.filemagic = filemagic
+
+    def implemented(self):
+        return False
+
+    def __call__(self, t):
+        pred("__CALL__ {}".format(t))
+
+    def put(self, src, dest, right=444):
+        porange("put is not implented for {}".format(self.filemagic))
+
+    def get(self, src, dest):
+        porange("get is not implented for {}".format(self.filemagic))
+
+    def rm(self, filename, on_error=print_error):
+        porange("rm is not implented for {}".format(self.filemagic))
+
+    def create(self, dest, content, right=444):
+        porange("create is not implented for {}".format(self.filemagic))
+
+    def sed(self, regex, path, right=444):
+        porange("sed is not implented for {}".format(self.filemagic))
+
+    @exall(subprocess.check_call, subprocess.CalledProcessError, print_error)
+    def resize(self, size):
+        subprocess.check_call(["qemu-img", "resize", self.rootfs, size])
+        subprocess.check_call(["ls", "-lh", self.rootfs])
+        pgreen("[+] Resized to {size}".format(size=size))
+
+    def correct(self, regex, path, right=444):
+        porange("correct is not implented for {}".format(self.filemagic))
+
+    def check(self):
+        porange("check is not implented for {}".format(self.filemagic))
+
+    def ls(self, path):
+        porange("ls is not implented for {}".format(self.filemagic))
diff --git a/arm_now/utils.py b/arm_now/utils.py
index 8c9cffc..7cdcee9 100644
--- a/arm_now/utils.py
+++ b/arm_now/utils.py
@@ -2,15 +2,9 @@
 import subprocess
 import os
 import sys
-import shutil
 import difflib
 import contextlib
 
-# once cpio fully supported will we still need this magic ?
-import magic
-from pySmartDL import SmartDL
-from exall import exall, ignore, print_warning, print_traceback, print_error
-
 """
 Utils functions:
     pcolor: Print with beautiful colors: porange, pgreen, pred.
@@ -53,25 +47,6 @@ def which(filename, **kwargs):
 def maybe_you_meant(string, strings):
     return ' or '.join(difflib.get_close_matches(string, strings, cutoff=0.3))
 
-@exall(os.mkdir, FileExistsError, ignore)
-def download(url, filename, cache_directory):
-    print("\nDownloading {} from {}".format(filename, url))
-    filename_cache = url.split('/')[-1]
-    filename_cache = ''.join([ c for c in filename_cache if c.isdigit() or c.isalpha() ])
-    filename_cache = cache_directory + "/" + filename_cache
-    print(filename_cache)
-    if os.path.exists(filename):
-        print("Filexists")
-    elif os.path.exists(filename_cache):
-        print("Already downloaded")
-        shutil.copyfile(filename_cache, filename)
-    else:
-        os.mkdir(cache_directory)
-        # wget.download(url, out=filename_cache)
-        obj = SmartDL(url, filename_cache)
-        obj.start()
-        shutil.copyfile(filename_cache, filename)
-
 def avoid_parameter_injection(params):
     new_params = []
     for p in params:
diff --git a/preconfigure.sh b/preconfigure.sh
index 7ad603a..a5b0f1e 100755
--- a/preconfigure.sh
+++ b/preconfigure.sh
@@ -13,7 +13,7 @@ do
   # cd cacert
   # curl https://curl.haxx.se/ca/cacert.pem | awk 'split_after==1{n++;split_after=0} /-----END CERTIFICATE-----/ {split_after=1} {print > "cert" n ".pem"}'
   # cd -
-  cat <<EOF>>config_ssl.sh
+  cat <<EOF>>config_ssl_and_pkg_manager.sh
 cd /root
 if [[ -e ./install_pkg_manager.sh ]]
 then
@@ -46,10 +46,10 @@ fi
 
 poweroff
 EOF
-  e2ls arm_now/rootfs.ext2:/root | grep install
+  echo armv5-eabi armv7-eabihf mips32el x86-64-core-i7 x86-core2 x86-i686 | grep -- "$arch"
   RET="$?"
   if [[ "$RET" == "0" ]]; then
-    arm_now start --autostart config_ssl.sh
+    arm_now start --autostart config_ssl_and_pkg_manager.sh
   fi
   tar -Jcf "$(cat arm_now/arch).tar.xz" arm_now/
 done

From e00e68cbfa5acf0971d15df7ee9c5526ede46500 Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Sun, 3 Jun 2018 16:33:42 +0200
Subject: [PATCH 26/34] download template

---
 arm_now/arm_now.py | 32 ++++++++++++++++++++------------
 preconfigure.sh    |  3 ++-
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index 80db24f..1ec8c8a 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -5,11 +5,12 @@
 """arm_now.
 Usage:
   arm_now list [--all]
-  arm_now start [<arch>] [--clean] [--sync] [--offline] [--autostart=<script>] [--add-qemu-options=<options>] [--redir=<port>]... 
+  arm_now start [<arch>] [--clean] [-s|--sync] [--offline] [--autostart=<script>] [--add-qemu-options=<options>] [--redir=<port>]... 
   arm_now clean
   arm_now resize <new_size> [--correct]
   arm_now install [<arch>] [--clean]
   arm_now show
+  arm_now download [<arch>] [--real-source]
   arm_now -h | --help
   arm_now --version
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -18,8 +19,9 @@
   start         Start a vm with a <arch> cpu. (default: armv5-eabi)
   resize        Resize the current rootfs. (example: resize 1G)
   clean         Delete the current rootfs.
-  install       Install and config a rootfs for the given <arch>. (default: armv5-eabi)
+  install       Download, install and config a rootfs for the given <arch>. (default: armv5-eabi)
   show          Show informations about the rootfs.
+  download      Download template for <arch>.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Options:
   --sync                        Synchronize the current directory with the vm home.
@@ -41,21 +43,16 @@
 """
 
 import os
-import urllib.request
-import requests
 import sys
 import re
 from multiprocessing import Pool
-from collections import defaultdict
-from pprint import pprint
-import shutil
 import contextlib
-import operator
-import subprocess
-import platform
-import tempfile
 import re
+from pathlib import Path
 
+# Exall is an exception manager based on decorator/context/callback
+# Check it out: https://github.com/nongiach/exall
+from exall import exall, ignore, print_warning, print_traceback, print_error
 from docopt import docopt
 
 from .utils import *
@@ -77,7 +74,8 @@ def main():
         do_list(a["--all"])
     elif a["start"]:
         do_start(a["<arch>"] or "armv5-eabi",
-                a["--clean"], a["--sync"], a["--offline"], a["--redir"],
+                a["--clean"], a["--sync"] or a["-s"],
+                a["--offline"], a["--redir"],
                 ' '.join(a["--add-qemu-options"]),
                 a["--autostart"])
     elif a["clean"]:
@@ -88,6 +86,8 @@ def main():
         do_install(a["<arch>"] or "armv5-eabi", a["--clean"])
     elif a["show"]:
         do_show()
+    elif a["download"]:
+        do_download(a["<arch>"], a["--real-source"])
 
 #  ================ End Argument Parsing ==============================
 
@@ -257,5 +257,13 @@ def do_show():
     Filesystem(Config.ROOTFS).ls("/root")
     print("~" * 80)
 
+@exall(os.mkdir, FileExistsError, ignore)
+def do_download(arch, real_source):
+    templates = str(Path.home()) + "/config/arm_now/templates/"
+    os.makedirs(templates)
+    filename = arch + ".tar.xz"
+    URL = "https://github.com/nongiach/arm_now_templates/raw/master/"
+    download(URL + filename, templates + filename, Config.DOWNLOAD_CACHE_DIR)
+
 if __name__ == "__main__":
     main()
diff --git a/preconfigure.sh b/preconfigure.sh
index a5b0f1e..4ff7640 100755
--- a/preconfigure.sh
+++ b/preconfigure.sh
@@ -7,7 +7,6 @@ do
   echo arch ARCH="$arch"
   arm_now install "$arch" --clean
   arm_now resize 100M
-  echo "Resize ok ?"
   # read
   # mkdir cacert
   # cd cacert
@@ -48,8 +47,10 @@ poweroff
 EOF
   echo armv5-eabi armv7-eabihf mips32el x86-64-core-i7 x86-core2 x86-i686 | grep -- "$arch"
   RET="$?"
+  echo "Preconfig.."
   if [[ "$RET" == "0" ]]; then
     arm_now start --autostart config_ssl_and_pkg_manager.sh
   fi
+  echo "Compress.."
   tar -Jcf "$(cat arm_now/arch).tar.xz" arm_now/
 done

From 52c6c7124f34f422ffce609b47073ce4bebb9037 Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Sun, 3 Jun 2018 23:19:26 +0200
Subject: [PATCH 27/34] download from github

---
 arm_now/arm_now.py  | 67 +++++++++++++++++++++++----------------------
 arm_now/config.py   |  4 +++
 arm_now/download.py | 31 +++++++++++++++++++--
 3 files changed, 66 insertions(+), 36 deletions(-)

diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index 1ec8c8a..5d1e467 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -5,12 +5,11 @@
 """arm_now.
 Usage:
   arm_now list [--all]
-  arm_now start [<arch>] [--clean] [-s|--sync] [--offline] [--autostart=<script>] [--add-qemu-options=<options>] [--redir=<port>]... 
+  arm_now start [<arch>] [--clean] [-s|--sync] [--offline] [--autostart=<script>] [--add-qemu-options=<options>] [--real-source] [--redir=<port>]... 
   arm_now clean
   arm_now resize <new_size> [--correct]
-  arm_now install [<arch>] [--clean]
+  arm_now install [<arch>] [--clean] [--real-source]
   arm_now show
-  arm_now download [<arch>] [--real-source]
   arm_now -h | --help
   arm_now --version
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -48,7 +47,6 @@
 from multiprocessing import Pool
 import contextlib
 import re
-from pathlib import Path
 
 # Exall is an exception manager based on decorator/context/callback
 # Check it out: https://github.com/nongiach/exall
@@ -59,7 +57,7 @@
 from .filesystem import Filesystem
 from .config import Config, qemu_options, install_opkg
 from . import options
-from .download import download, scrawl_kernel
+from .download import  download_image, scrawl_kernel
 
 def main():
     """ Call the function according to the asked command
@@ -77,21 +75,19 @@ def main():
                 a["--clean"], a["--sync"] or a["-s"],
                 a["--offline"], a["--redir"],
                 ' '.join(a["--add-qemu-options"]),
-                a["--autostart"])
+                a["--autostart"], a["--real-source"])
     elif a["clean"]:
         options.clean(Config)
     elif a["resize"]:
         do_resize(a["<new_size>"], a["--correct"])
     elif a["install"]:
-        do_install(a["<arch>"] or "armv5-eabi", a["--clean"])
+        do_install(a["<arch>"] or "armv5-eabi", a["--clean"], a["--real-source"])
     elif a["show"]:
         do_show()
-    elif a["download"]:
-        do_download(a["<arch>"], a["--real-source"])
 
 #  ================ End Argument Parsing ==============================
 
-def do_start(arch, clean, sync, offline, redir, add_qemu_options, autostart):
+def do_start(arch, clean, sync, offline, redir, add_qemu_options, autostart, real_source):
     """Setup and start a virtualmachine using qemu.
 
     :param arch: The cpu architecture that will be started.
@@ -101,10 +97,9 @@ def do_start(arch, clean, sync, offline, redir, add_qemu_options, autostart):
     :param sync: Sync le current directory with the guest.
     """
     add_qemu_options += " " + convert_redir_to_qemu_args(redir)
+    do_install(arch, clean, real_source)
     fs = Filesystem(Config.ROOTFS)
-    if clean: option.clean(Config)
-    if not offline: do_install(arch)
-    config_filesystem(Config.ROOTFS, arch)
+    if real_source: config_filesystem(Config.ROOTFS, arch)
     if sync: options.sync_upload(Config.ROOTFS, src=".", dest="/root")
     options.autostart(Config.ROOTFS, autostart)
     run_qemu(arch, Config.KERNEL, Config.DTB, Config.ROOTFS, add_qemu_options)
@@ -144,7 +139,7 @@ def is_already_created(arch):
     options.clean(Config)
     return False
 
-def do_install(arch, clean=False):
+def do_install(arch, clean, real_source):
     """ download and setup filesystem and kernel
     """
     if clean: options.clean(Config)
@@ -152,22 +147,36 @@ def do_install(arch, clean=False):
         pred("ERROR: I don't know this arch='{}' yet".format(arch), file=sys.stderr)
         porange("maybe you meant: {}".format(maybe_you_meant(arch, qemu_options.keys()) or qemu_options.keys()), file=sys.stderr)
         sys.exit(1)
-    kernel, dtb, rootfs = scrawl_kernel(arch)
-    if kernel is None or rootfs is None:
-        pred("ERROR: couldn't download files for this arch", file=sys.stderr)
-        sys.exit(1)
     if is_already_created(arch):
         porange("WARNING: {} already exists, use --clean to restart with a fresh filesystem".format(Config.DIR))
         return
-    with contextlib.suppress(FileExistsError):
-        os.mkdir(Config.DIR)
-    download(kernel, Config.KERNEL, Config.DOWNLOAD_CACHE_DIR)
-    if dtb: download(dtb, Config.DTB, Config.DOWNLOAD_CACHE_DIR)
-    download(rootfs, Config.ROOTFS, Config.DOWNLOAD_CACHE_DIR)
-    with open(Config.DIR + "/arch", "w") as F:
-        F.write(arch)
+    with contextlib.suppress(FileExistsError): os.mkdir(Config.DIR)
+    download_image(arch, dest=Config.DIR, real_source=real_source)
     pgreen("[+] Installed")
 
+# def do_install_real_source(arch, clean=False):
+#     """ download and setup filesystem and kernel
+#     """
+#     if clean: options.clean(Config)
+#     if arch not in qemu_options:
+#         pred("ERROR: I don't know this arch='{}' yet".format(arch), file=sys.stderr)
+#         porange("maybe you meant: {}".format(maybe_you_meant(arch, qemu_options.keys()) or qemu_options.keys()), file=sys.stderr)
+#         sys.exit(1)
+#     kernel, dtb, rootfs = scrawl_kernel(arch)
+#     if kernel is None or rootfs is None:
+#         pred("ERROR: couldn't download files for this arch", file=sys.stderr)
+#         sys.exit(1)
+#     if is_already_created(arch):
+#         porange("WARNING: {} already exists, use --clean to restart with a fresh filesystem".format(Config.DIR))
+#         return
+#     with contextlib.suppress(FileExistsError):
+#         os.mkdir(Config.DIR)
+#     download(kernel, Config.KERNEL, Config.DOWNLOAD_CACHE_DIR)
+#     if dtb: download(dtb, Config.DTB, Config.DOWNLOAD_CACHE_DIR)
+#     download(rootfs, Config.ROOTFS, Config.DOWNLOAD_CACHE_DIR)
+#     with open(Config.DIR + "/arch", "w") as F:
+#         F.write(arch)
+#     pgreen("[+] Installed")
 
 def config_filesystem(rootfs, arch):
     fs = Filesystem(rootfs)
@@ -257,13 +266,5 @@ def do_show():
     Filesystem(Config.ROOTFS).ls("/root")
     print("~" * 80)
 
-@exall(os.mkdir, FileExistsError, ignore)
-def do_download(arch, real_source):
-    templates = str(Path.home()) + "/config/arm_now/templates/"
-    os.makedirs(templates)
-    filename = arch + ".tar.xz"
-    URL = "https://github.com/nongiach/arm_now_templates/raw/master/"
-    download(URL + filename, templates + filename, Config.DOWNLOAD_CACHE_DIR)
-
 if __name__ == "__main__":
     main()
diff --git a/arm_now/config.py b/arm_now/config.py
index c9c82f8..9b3a677 100644
--- a/arm_now/config.py
+++ b/arm_now/config.py
@@ -1,5 +1,9 @@
 class Config:
     DIR = "arm_now/"
+    kernel = "kernel"
+    dtb = "dtb"
+    rootfs = "rootfs.ext2"
+    arch = "arch"
     KERNEL = DIR + "kernel"
     DTB = DIR + "dtb"
     ROOTFS = DIR + "rootfs.ext2"
diff --git a/arm_now/download.py b/arm_now/download.py
index 2110e0c..d3b3d67 100644
--- a/arm_now/download.py
+++ b/arm_now/download.py
@@ -2,26 +2,28 @@
 import re
 import requests
 import shutil
+from subprocess import check_call
 from collections import defaultdict
+from pathlib import Path
 
 # Exall is an exception manager based on decorator/context/callback
 # Check it out: https://github.com/nongiach/exall
 from exall import exall, ignore, print_warning, print_traceback, print_error
 from pySmartDL import SmartDL
+from .config import Config
 
 @exall(os.mkdir, FileExistsError, ignore)
 def download(url, filename, cache_directory):
-    print("\nDownloading {} from {}".format(filename, url))
     filename_cache = url.split('/')[-1]
     filename_cache = ''.join([ c for c in filename_cache if c.isdigit() or c.isalpha() ])
     filename_cache = cache_directory + "/" + filename_cache
-    print(filename_cache)
     if os.path.exists(filename):
-        print("Filexists")
+        return
     elif os.path.exists(filename_cache):
         print("Already downloaded")
         shutil.copyfile(filename_cache, filename)
     else:
+        print("\nDownloading {} from {}".format(filename, url))
         os.mkdir(cache_directory)
         # wget.download(url, out=filename_cache)
         obj = SmartDL(url, filename_cache)
@@ -84,3 +86,26 @@ def get_link_filetype(link):
     print("ERROR: I don't know this kind of file {}".format(link), file=sys.stderr)
     # os.kill(0, 9)
     return None
+
+@exall(os.mkdir, FileExistsError, ignore)
+def download_from_github(arch):
+    templates = str(Path.home()) + "/.config/arm_now/templates/"
+    os.makedirs(templates)
+    filename = arch + ".tar.xz"
+    URL = "https://github.com/nongiach/arm_now_templates/raw/master/"
+    download(URL + filename, templates + filename, Config.DOWNLOAD_CACHE_DIR)
+
+def download_image(arch, *, dest, real_source):
+    if real_source:
+        kernel, dtb, rootfs = scrawl_kernel(arch)
+        if kernel is None or rootfs is None:
+            pred("ERROR: couldn't download files for this arch", file=sys.stderr)
+            sys.exit(1)
+        download(kernel, dest + Config.kernel, Config.DOWNLOAD_CACHE_DIR)
+        if dtb: download(dtb, dest + Config.dtb, Config.DOWNLOAD_CACHE_DIR)
+        download(rootfs, dest + Config.rootfs, Config.DOWNLOAD_CACHE_DIR)
+    else:
+        download_from_github(arch)
+        check_call("tar xf ~/.config/arm_now/templates/{}.tar.xz {}".format(arch, dest), shell=True)
+    with open(dest + "/arch", "w") as F:
+        F.write(arch)

From 6757e4980c6a0918804122375c2009def3853562 Mon Sep 17 00:00:00 2001
From: nongiach <betsizaraina.chaignon@epitech.eu>
Date: Mon, 4 Jun 2018 23:22:10 +0200
Subject: [PATCH 28/34] Update dev-doc.md

---
 dev-doc.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev-doc.md b/dev-doc.md
index 1de3af6..16b2578 100644
--- a/dev-doc.md
+++ b/dev-doc.md
@@ -1,6 +1,10 @@
+```sh
 mkdir venv
 python3 -m venv venv
 pip uninstall arm_now
 python3 setup.py install
+```
 # to delete untracked files populated by setup install
+```sh
 git clean -fdx
+```

From 2d50f5a0016a246742f37124b707270cd6905e74 Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Mon, 4 Jun 2018 23:53:50 +0200
Subject: [PATCH 29/34] real_source config

---
 arm_now/arm_now.py | 23 +++++++++++++++++++----
 preconfigure.sh    |  9 +++++++--
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index 5d1e467..b590c07 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -10,6 +10,7 @@
   arm_now resize <new_size> [--correct]
   arm_now install [<arch>] [--clean] [--real-source]
   arm_now show
+  arm_now offline
   arm_now -h | --help
   arm_now --version
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -47,6 +48,7 @@
 from multiprocessing import Pool
 import contextlib
 import re
+from pathlib import Path
 
 # Exall is an exception manager based on decorator/context/callback
 # Check it out: https://github.com/nongiach/exall
@@ -57,7 +59,7 @@
 from .filesystem import Filesystem
 from .config import Config, qemu_options, install_opkg
 from . import options
-from .download import  download_image, scrawl_kernel
+from .download import  download_image, scrawl_kernel, download
 
 def main():
     """ Call the function according to the asked command
@@ -84,6 +86,9 @@ def main():
         do_install(a["<arch>"] or "armv5-eabi", a["--clean"], a["--real-source"])
     elif a["show"]:
         do_show()
+    elif a["offline"]:
+        do_offline()
+
 
 #  ================ End Argument Parsing ==============================
 
@@ -99,7 +104,7 @@ def do_start(arch, clean, sync, offline, redir, add_qemu_options, autostart, rea
     add_qemu_options += " " + convert_redir_to_qemu_args(redir)
     do_install(arch, clean, real_source)
     fs = Filesystem(Config.ROOTFS)
-    if real_source: config_filesystem(Config.ROOTFS, arch)
+    config_filesystem(Config.ROOTFS, arch, real_source)
     if sync: options.sync_upload(Config.ROOTFS, src=".", dest="/root")
     options.autostart(Config.ROOTFS, autostart)
     run_qemu(arch, Config.KERNEL, Config.DTB, Config.ROOTFS, add_qemu_options)
@@ -178,7 +183,7 @@ def do_install(arch, clean, real_source):
 #         F.write(arch)
 #     pgreen("[+] Installed")
 
-def config_filesystem(rootfs, arch):
+def config_filesystem(rootfs, arch, real_source):
     fs = Filesystem(rootfs)
     fs.rm('/etc/init.d/S40network')
     fs.rm('/etc/init.d/S90tests')
@@ -194,7 +199,7 @@ def config_filesystem(rootfs, arch):
 route add default gw 10.0.2.2
 echo 'nameserver 10.0.2.3' >> /etc/resolv.conf
 """, right=555)
-    if arch in install_opkg:
+    if arch in install_opkg and real_source:
         fs.create("/root/install_pkg_manager.sh", """
 {install_opkg}
 opkg update
@@ -266,5 +271,15 @@ def do_show():
     Filesystem(Config.ROOTFS).ls("/root")
     print("~" * 80)
 
+@exall(os.makedirs, FileExistsError, ignore)
+def do_offline():
+    URL = "https://github.com/nongiach/arm_now_templates/archive/master.zip"
+    templates = str(Path.home()) + "/.config/arm_now/templates/"
+    master_zip = str(Path.home()) + "/.config/arm_now/templates/master.zip"
+    os.makedirs(templates)
+    download(URL, master_zip, Config.DOWNLOAD_CACHE_DIR)
+    os.chdir(templates)
+    check_call("tar zxf master.zip".format(arch, dest), shell=True)
+
 if __name__ == "__main__":
     main()
diff --git a/preconfigure.sh b/preconfigure.sh
index 4ff7640..19255e6 100755
--- a/preconfigure.sh
+++ b/preconfigure.sh
@@ -5,7 +5,7 @@ cd preconfig
 for arch in $(arm_now list)
 do
   echo arch ARCH="$arch"
-  arm_now install "$arch" --clean
+  arm_now install "$arch" --clean --real-source
   arm_now resize 100M
   # read
   # mkdir cacert
@@ -32,6 +32,11 @@ then
   sed 's/http:/https:/g' /opt/etc/opkg.conf > /opt/etc/opkg.conf.bak
   mv /opt/etc/opkg.conf.bak /opt/etc/opkg.conf
 
+  opkg install gdb
+  opkg install gdb_server
+  opkg install gdb_legacy # for mips32el
+  opkg install gdbserver_legacy # for mips32el
+  opkg install strace
   ######## 
   # opkg install git
   # opkg install git-http
@@ -49,7 +54,7 @@ EOF
   RET="$?"
   echo "Preconfig.."
   if [[ "$RET" == "0" ]]; then
-    arm_now start --autostart config_ssl_and_pkg_manager.sh
+    arm_now start --autostart config_ssl_and_pkg_manager.sh --real-source
   fi
   echo "Compress.."
   tar -Jcf "$(cat arm_now/arch).tar.xz" arm_now/

From b258124cf3583f7dc7a1f57fe24d293a3a1262ae Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Tue, 5 Jun 2018 00:04:24 +0200
Subject: [PATCH 30/34] message to lucasduffey

---
 arm_now/arm_now.py | 2 +-
 arm_now/config.py  | 6 ++++++
 setup.py           | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index b590c07..79d39a5 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -21,7 +21,7 @@
   clean         Delete the current rootfs.
   install       Download, install and config a rootfs for the given <arch>. (default: armv5-eabi)
   show          Show informations about the rootfs.
-  download      Download template for <arch>.
+  offline       Donlowad all rootfs and kernel so arm_now can be fully runned offline.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Options:
   --sync                        Synchronize the current directory with the vm home.
diff --git a/arm_now/config.py b/arm_now/config.py
index 9b3a677..b2c3a45 100644
--- a/arm_now/config.py
+++ b/arm_now/config.py
@@ -45,6 +45,12 @@ class Config:
         "xtensa-lx60": ["xtensa", "-M lx60 -cpu dc233c -monitor null -nographic -kernel {kernel} -monitor null"]
         }
 
+""" The final user is not vulnerable to MITM attack, thoose http links are used to preconfigure the package manager.
+When you do a arm_now start armv5-eabi the image you are downloading already has opkg installed and
+everything is configured to use https, zero request are made over http.
+thx lucasduffey
+"""
+
 install_opkg = {
         "armv5-eabi":"""wget -O - http://pkg.entware.net/binaries/armv5/installer/entware_install.sh | /bin/sh""",
         "armv7-eabihf":"""wget -O - http://pkg.entware.net/binaries/armv5/installer/entware_install.sh | /bin/sh""",
diff --git a/setup.py b/setup.py
index a875717..563ba6e 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
         author='@chaign_c',
         url='https://github.com/nongiach/arm_now',
         packages=['arm_now'],
-        py_modules=['arm_now', 'arm_now.utils'],
+        py_modules=['arm_now'],
         entry_points = {
             'console_scripts': [
                 'arm_now = arm_now:main',

From 5c13f0949c8cd0b423e69392d0ec1055680ab968 Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Wed, 6 Jun 2018 00:21:49 +0200
Subject: [PATCH 31/34] fix offline crashes

---
 arm_now/arm_now.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index 79d39a5..54817ac 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -49,6 +49,7 @@
 import contextlib
 import re
 from pathlib import Path
+from subprocess import check_call
 
 # Exall is an exception manager based on decorator/context/callback
 # Check it out: https://github.com/nongiach/exall
@@ -214,7 +215,8 @@ 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("qemu-system-arm", ubuntu="apt-get install qemu", arch="yaourt -S qemu-arch-extra")
+            which("qemu-system-arm", ubuntu="apt-get install qemu", arch="pacman -S qemu-arch-extra")
+            which("unzip", ubuntu="apt-get install unzip", arch="pacman -S unzip")
             ]
     if not all(dependencies):
         print("requirements missing, plz install them", file=sys.stderr)
@@ -277,9 +279,12 @@ def do_offline():
     templates = str(Path.home()) + "/.config/arm_now/templates/"
     master_zip = str(Path.home()) + "/.config/arm_now/templates/master.zip"
     os.makedirs(templates)
+    # download_from_github(arch)
     download(URL, master_zip, Config.DOWNLOAD_CACHE_DIR)
     os.chdir(templates)
-    check_call("tar zxf master.zip".format(arch, dest), shell=True)
+    check_call("unzip master.zip", shell=True)
+    check_call("mv arm_now_templates-master/* .", shell=True)
+    check_call("rm -rf arm_now_templates-master/ README.md master.zip", shell=True)
 
 if __name__ == "__main__":
     main()

From 35be15519238b33ad8ec94bfedf863679e34014a Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Wed, 6 Jun 2018 00:22:55 +0200
Subject: [PATCH 32/34] oups, I forgot a comma

---
 arm_now/arm_now.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index 54817ac..932a59f 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -215,7 +215,7 @@ 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("qemu-system-arm", ubuntu="apt-get install qemu", arch="pacman -S qemu-arch-extra")
+            which("qemu-system-arm", ubuntu="apt-get install qemu", arch="pacman -S qemu-arch-extra"),
             which("unzip", ubuntu="apt-get install unzip", arch="pacman -S unzip")
             ]
     if not all(dependencies):

From f6ccd5554055edbdaa7f183f6ca39d109ccf292b Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Wed, 6 Jun 2018 01:35:23 +0200
Subject: [PATCH 33/34] fix platform detection

---
 arm_now/utils.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arm_now/utils.py b/arm_now/utils.py
index 7cdcee9..b177b67 100644
--- a/arm_now/utils.py
+++ b/arm_now/utils.py
@@ -4,6 +4,7 @@
 import sys
 import difflib
 import contextlib
+import platform
 
 """
 Utils functions:

From fd942d1f7e9871365d787099fe0fbdf01270f699 Mon Sep 17 00:00:00 2001
From: chaign_c <betsizaraina.chaignon@epitech.eu>
Date: Fri, 8 Jun 2018 00:06:48 +0200
Subject: [PATCH 34/34] fix git list -all

---
 arm_now/arm_now.py  | 4 ++--
 arm_now/download.py | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arm_now/arm_now.py b/arm_now/arm_now.py
index 932a59f..32bd625 100755
--- a/arm_now/arm_now.py
+++ b/arm_now/arm_now.py
@@ -21,7 +21,7 @@
   clean         Delete the current rootfs.
   install       Download, install and config a rootfs for the given <arch>. (default: armv5-eabi)
   show          Show informations about the rootfs.
-  offline       Donlowad all rootfs and kernel so arm_now can be fully runned offline.
+  offline       Download all rootfs and kernel so arm_now can be fully runned offline.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Options:
   --sync                        Synchronize the current directory with the vm home.
@@ -60,7 +60,7 @@
 from .filesystem import Filesystem
 from .config import Config, qemu_options, install_opkg
 from . import options
-from .download import  download_image, scrawl_kernel, download
+from .download import  download_image, scrawl_kernel, download, indexof_parse
 
 def main():
     """ Call the function according to the asked command
diff --git a/arm_now/download.py b/arm_now/download.py
index d3b3d67..17bedea 100644
--- a/arm_now/download.py
+++ b/arm_now/download.py
@@ -1,4 +1,5 @@
 import os
+import sys
 import re
 import requests
 import shutil