Merge branch 'dev'

.gitignore

@@ -4,3 +4,4 @@ source/build_*
 *.pyc
 *.xml
 *.iml
+.directory

.gitmodules

@@ -25,3 +25,6 @@
 [submodule "other/cptoml"]
 	path = other/cptoml
 	url = https://github.com/bill88t/cptoml
+[submodule "other/CircuitPython_FTP_Server"]
+	path = other/CircuitPython_FTP_Server
+	url = https://github.com/bill88t/CircuitPython_FTP_Server

LjinuxRoot/bin/cd.py

@@ -3,15 +3,18 @@
 try:
     vr("dirr", ljinux.api.getvar("argj").split()[1])
     if vr("dirr") != "-":
-        chdir(ljinux.api.betterpath(vr("dirr")))
-        if vr("capdir") != getcwd():
-            ljinux.based.user_vars["prevdir"] = vr("capdir")
+        vr("dr", ljinux.api.isdir(vr("dirr")))
+        if vr("dr") == 1:
+            chdir(ljinux.api.betterpath(vr("dirr")))
+            if vr("capdir") != getcwd():
+                ljinux.api.setvar("prevdir", vr("capdir"))
+        elif not vr("dr"):
+            ljinux.based.error(14, "cd")
+        else:
+            ljinux.based.error(17, "cd")
     else:
         chdir(ljinux.based.user_vars["prevdir"])
+        ljinux.api.setvar("prevdir", vr("capdir"))
     ljinux.based.olddir = getcwd()
-except OSError:
-    term.write(
-        "Error: '" + ljinux.api.getvar("argj").split()[1] + "' Directory does not exist"
-    )
 except IndexError:
     pass

LjinuxRoot/bin/date.py

@@ -24,7 +24,7 @@
     else:
         raise IndexError
 except IndexError:
-    pv[get_pid()]["tt"] = time.localtime()
+    vr("tt", time.localtime())
     vr(
         "dat",
         [

LjinuxRoot/bin/sensors.py

@@ -1,6 +1,14 @@
-term.write(
-    "cpu_thermal\nAdapter: Cpu device\ntemp1: +"
-    + str(cpu.temperature)[:5]
-    + "°C"
-    + ("\nvoltage1: " + str(cpu.voltage) + "v" if cpu.voltage is not None else "")
-)
+rename_process("sensors")
+vr("no", True)
+if cpu.temperature is not None:
+    vr("no", False)
+    term.write(
+        "cpu_thermal\nAdapter: Cpu device\ntemp1: +" + str(cpu.temperature)[:5] + "°C"
+    )
+
+if cpu.voltage is not None:
+    vr("no", False)
+    term.write("voltage1: " + str(cpu.voltage) + "V")
+
+if vr("no"):
+    term.write("No sensors detected!")

LjinuxRoot/bin/stringproccessing/line_wrap.py

@@ -1,7 +1,7 @@
 rename_process("line_wrap")
 vr("l", pv[get_parent_pid()]["lines"])
 vr("lines", [], pid=get_parent_pid())
-vr("sizee", term.detect_size())
+vr("sizee", term.detect_size(3))
 for pv[get_pid()]["i"] in vr("l"):
     vr("rem", vr("i"))
     if vr("rem") != "":

LjinuxRoot/etc/jpkg/data/help.txt

@@ -1,4 +1,4 @@
-Ljinux package manager version 0.
+Ljinux package manager version 1.
 
 Usage:
     jpkg install package_file.jpkg