Compare commits

..

No commits in common. "4eee568840d897a1b9ce98a1888aca7f8d07903d" and "314ea6542728ae4cd5c1cf9d082076389ff65e18" have entirely different histories.

7 changed files with 12 additions and 12 deletions

View File

@ -10,13 +10,13 @@ def get_app_class(template):
try: try:
for file in os.listdir(path): for file in os.listdir(path):
self.console.write(file) print(file)
except OSError as e: except OSError as e:
try: try:
os.stat(path) os.stat(path)
self.console.write(path) print(path)
except OSError: except OSError:
self.console.write(f"ls: cannot access '{path}': No such file or directory") print(f"ls: cannot access '{path}': No such file or directory")
self.exit() self.exit()

View File

@ -5,7 +5,7 @@ def get_app_class(template):
for pid, app in apps.items(): for pid, app in apps.items():
args = app.argv[1:] args = app.argv[1:]
name = app.name name = app.name
self.console.write(f'{pid} {name} {args}') print(f'{pid} {name} {args}')
self.exit() self.exit()
return App return App

View File

@ -1,4 +1,4 @@
import fibonaccios.exceptions import circuitos.exceptions
import shlex import shlex
import console import console
@ -8,7 +8,7 @@ def get_app_class(template):
self.jump('prompt') self.jump('prompt')
def F_prompt(self): def F_prompt(self):
self.console.write(b'FibonacciOS sh # ') self.console.write(b'CicuitOS sh # ')
self.store['buf'] = [] self.store['buf'] = []
self.jump('input') self.jump('input')
@ -26,7 +26,7 @@ def get_app_class(template):
pid = self.os.launch(*line) pid = self.os.launch(*line)
self.wait(pid) self.wait(pid)
self.transfer_console(pid) self.transfer_console(pid)
except fibonaccios.exceptions.AppNotFound as e: except circuitos.exceptions.AppNotFound as e:
print('error: app not found') print('error: app not found')
self.jump('prompt') self.jump('prompt')

View File

@ -1,8 +1,8 @@
import bin #this is at the end of the script in case any functions from bin import bin #this is at the end of the script in case any functions from bin
#depend on anything here #depend on anything here
from fibonaccios.exceptions import * from circuitos.exceptions import *
from fibonaccios.apploader import get_app from circuitos.apploader import get_app
import fibonaccios.apploader # apploader hack import circuitos.apploader # apploader hack
import time import time
import usb_cdc import usb_cdc

View File

@ -1,2 +1,2 @@
import fibonaccios import circuitos
fibonaccios.run() circuitos.run()