Remove i-nex-usage and i-nex-uname

I-Nex/i-nex/.src/Finfosys.class

@@ -292,14 +292,13 @@ Public Sub ComboBox1_Click()
 End
 
 Public Sub kernel()
-  Dim UNAME_DATA As String
-  Try Exec ["/usr/bin/i-nex-uname"] Wait To UNAME_DATA
-  Try UNAME = JSON.Decode(UNAME_DATA)
-  Try TextLabel7.Text = "System name:  " & UNAME["System_name"]
-  Try TextLabel16.Text = "Nodename:    " & UNAME["Nodename"]
-  Try TextLabel17.Text = "Release:     " & UNAME["Release"]
-  Try TextLabel18.Text = "Version:     " & UNAME["Version"]
-  Try TextLabel26.Text = "Machine:     " & UNAME["Machine"]
+  Dim Machine As String
+  Try TextLabel18.Text = "Build Date: " & CString(File.Load("/proc/sys/kernel/version"))
+  Try TextLabel17.Text = "OS Release: " & CString(File.Load("/proc/sys/kernel/osrelease"))
+  Try TextLabel7.Text = "OS Type: " & CString(File.Load("/proc/sys/kernel/ostype"))
+  Try TextLabel16.Text = "Hostname: " & CString(File.Load("/proc/sys/kernel/hostname"))
+  Try Exec ["arch"] Wait To Machine
+  TextLabel26.Text = "Machine: " & CString(Machine)
   Try TextArea3.Text = File.Load("/proc/cmdline")
 End
 
@@ -1269,4 +1268,4 @@ End
 
 Public Sub ComboBox10_Click()
 MDecode_dimms._inits()
-End
+End

I-Nex/i-nex/.src/Finfosys.form

@@ -1548,36 +1548,6 @@
     }
     Index = 6
     Text = "Kernel"
-    { TextLabel18 TextLabel
-      Move(14,126,441,28)
-      Font = Font["8"]
-      Alignment = Align.Normal
-      Border = Border.Raised
-    }
-    { TextLabel17 TextLabel
-      Move(14,98,441,28)
-      Font = Font["8"]
-      Alignment = Align.Normal
-      Border = Border.Raised
-    }
-    { TextLabel16 TextLabel
-      Move(14,70,441,28)
-      Font = Font["8"]
-      Alignment = Align.Normal
-      Border = Border.Raised
-    }
-    { TextLabel7 TextLabel
-      Move(14,42,441,28)
-      Font = Font["8"]
-      Alignment = Align.Normal
-      Border = Border.Raised
-    }
-    { TextLabel26 TextLabel
-      Move(14,14,441,28)
-      Font = Font["8"]
-      Alignment = Align.Normal
-      Border = Border.Raised
-    }
     { Label228 Label
       Move(154,168,168,28)
       Font = Font["8"]
@@ -1603,6 +1573,36 @@
     { Separator10 Separator
       Move(0,161,469,14)
     }
+    { TextLabel26 TextLabel
+      Move(0,0,462,28)
+      Font = Font["8"]
+      Alignment = Align.Normal
+      Border = Border.Raised
+    }
+    { TextLabel7 TextLabel
+      Move(0,28,462,28)
+      Font = Font["8"]
+      Alignment = Align.Normal
+      Border = Border.Raised
+    }
+    { TextLabel16 TextLabel
+      Move(0,56,462,28)
+      Font = Font["8"]
+      Alignment = Align.Normal
+      Border = Border.Raised
+    }
+    { TextLabel17 TextLabel
+      Move(0,84,462,28)
+      Font = Font["8"]
+      Alignment = Align.Normal
+      Border = Border.Raised
+    }
+    { TextLabel18 TextLabel
+      Move(0,112,462,28)
+      Font = Font["8"]
+      Alignment = Align.Normal
+      Border = Border.Raised
+    }
     Index = 7
     Text = "Memory"
     Picture = Picture["AppIcons/Finfosys/utilities-system-monitor.png"]

JSON/Makefile

@@ -10,10 +10,8 @@ endif
 
 make-binary: compile-i-nex-edid \
 	     compile-i-nex-cpuid \
-	     compile-i-nex-usage \
 	     compile-i-nex-cpusage \
-	     compile-i-nex-glinfo \
-	     compile-i-nex-uname
+	     compile-i-nex-glinfo
 
 compile-i-nex-edid:
 	@echo -e '$(OK_COLOR)Compile i-nex-edid $(OK_STRING)$(NO_COLOR)'
@@ -23,10 +21,6 @@ compile-i-nex-cpuid:
 	@echo -e '$(OK_COLOR)Compile i-nex-cpuid $(OK_STRING)$(NO_COLOR)'
 	$(CC) -o i-nex-cpuid i-nex-cpuid.c $(CC_OPTS_LIBCPUID) $(additional_confflags)
 
-compile-i-nex-usage:
-	@echo -e '$(OK_COLOR)Compile i-nex-usage $(OK_STRING)$(NO_COLOR)'
-	$(CC) -o i-nex-usage i-nex-usage.c $(CC_OPTS_LIBPROCPS) $(additional_confflags)
-
 compile-i-nex-cpusage:
 	@echo -e '$(OK_COLOR)Compile i-nex-cpusage $(OK_STRING)$(NO_COLOR)'
 	$(CC) -o i-nex-cpusage i-nex-cpusage.c $(additional_confflags)
@@ -35,37 +29,25 @@ compile-i-nex-glinfo:
 	@echo -e '$(OK_COLOR)Compile i-nex-glinfo $(OK_STRING)$(NO_COLOR)'
 	$(CC) -o i-nex-glinfo glinfo_common.c i-nex-glinfo.c $(libx11) $(libgl) $(libxext) $(additional_confflags)
 
-compile-i-nex-uname:
-	@echo -e '$(OK_COLOR)Compile i-nex-uname $(OK_STRING)$(NO_COLOR)'
-	$(CC) -o i-nex-uname i-nex-uname.c $(additional_confflags)
-
 install: install-set-executables install-bin
 install-set-executables: set-executable-i-nex-edid \
 			 set-executable-i-nex-cpuid \
-			 set-executable-i-nex-usage \
 			 set-executable-i-nex-cpusage \
-			 set-executable-i-nex-glinfo \
-			 set-executable-i-nex-uname 
+			 set-executable-i-nex-glinfo
 
 set-executable-i-nex-edid:
 	chmod +x i-nex-edid
 set-executable-i-nex-cpuid:
 	chmod +x i-nex-cpuid
-set-executable-i-nex-usage:
-	chmod +x i-nex-usage
 set-executable-i-nex-cpusage:
 	chmod +x i-nex-cpusage
 set-executable-i-nex-glinfo:
 	chmod +x i-nex-glinfo
-set-executable-i-nex-uname:
-	chmod +x i-nex-uname
 
 install-bin: install-bin-i-nex-edid \
 	     install-bin-i-nex-cpuid \
-	     install-bin-i-nex-usage \
 	     install-bin-i-nex-cpusage \
 	     install-bin-i-nex-glinfo \
-	     install-bin-i-nex-uname \
 	     install-bin-i-nex-dimms
 
 
@@ -85,9 +67,6 @@ install-bin-i-nex-cpusage:
 install-bin-i-nex-glinfo:
 	test -d $(DESTDIR)$(bindir) || mkdir $(DESTDIR)$(bindir)
 	$(INSTALL) 0755 i-nex-glinfo $(DESTDIR)$(bindir)
-install-bin-i-nex-uname:
-	test -d $(DESTDIR)$(bindir) || mkdir $(DESTDIR)$(bindir)
-	$(INSTALL) 0755 i-nex-uname $(DESTDIR)$(bindir)
 install-bin-i-nex-dimms:
 	test -d $(DESTDIR)$(bindir) || mkdir $(DESTDIR)$(bindir)
 	$(INSTALL) 0755 i-nex-dimms $(DESTDIR)$(bindir)
@@ -97,5 +76,4 @@ clean:
 	$(RM_COM) $(RMFILE_OPT) i-nex-cpuid
 	$(RM_COM) $(RMFILE_OPT) i-nex-usage
 	$(RM_COM) $(RMFILE_OPT) i-nex-cpusage
-	$(RM_COM) $(RMFILE_OPT) i-nex-glinfo
-	$(RM_COM) $(RMFILE_OPT) i-nex-uname
+	$(RM_COM) $(RMFILE_OPT) i-nex-glinfo