Merge branch 'master' of https://github.com/Andy-Python-Programmer/aero

Author: Andy-Python-Programmer

.gitpod.Dockerfile

@@ -0,0 +1,9 @@
+FROM gitpod/workspace-full-vnc
+
+RUN sudo apt-get install -y \
+    nasm \
+    cpio \
+    xorriso \
+    qemu-system-x86-64
+    
+RUN python3 -m pip install requests xbstrap

.gitpod.yml

@@ -0,0 +1,14 @@
+image:
+  file: .gitpod.Dockerfile
+
+ports:
+# vnc
+- port: 6080
+# open-preview is too small to reliably use, especially on smaller viewports
+  onOpen: open-browser
+- port: 5900
+  onOpen: ignore
+
+tasks:
+- init: ./aero.py --no-run
+  command: ./aero.py --only-run

aero.py

@@ -161,6 +161,11 @@ def parse_args():
                         default=False,
                         action='store_true',
                         help='doesn\'t run the built image in emulator when applicable')
+    
+    parser.add_argument('--only-run',
+                        default=False,
+                        action='store_true',
+                        help='runs aero without rebuilding. ignores any build-related flags')
 
     parser.add_argument('--bios',
                         type=str,
@@ -638,7 +643,24 @@ def main():
 
     download_bundled()
 
-    if args.clean:
+    if args.only_run:
+        iso_path = os.path.join(BUILD_DIR, 'aero.iso')
+
+        if not os.path.exists(iso_path):
+            user_bins = build_userland(args)
+
+            if not user_bins:
+                return
+
+            kernel_bin = build_kernel(args)
+
+            if not kernel_bin or args.check:
+                return
+
+            kernel_bin = kernel_bin[0]
+            iso_path = prepare_iso(args, kernel_bin, user_bins)
+        run_in_emulator(args, iso_path)
+    elif args.clean:
         src_target = os.path.join('src', 'target', args.target)
         userland_target = os.path.join('userland', 'target')