Merge pull request #5 from m0rphtail/dev

fix some bugs
m0rphtail · May 18, 2021 · 3784e49 · 3784e49
2 parents 79a47f6 + b1ddc54
commit 3784e49
Show file tree

Hide file tree

Showing 15 changed files with 8 additions and 12 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
diff --git a/.gitignore b/.gitignore
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/bin/arch.js b/bin/arch.js
diff --git a/bin/cpu.js b/bin/cpu.js
diff --git a/bin/hostname.js b/bin/hostname.js
diff --git a/bin/kernel.js b/bin/kernel.js
diff --git a/bin/memory.js b/bin/memory.js
@@ -2,12 +2,6 @@ const os = require("os");
 
 module.exports = () => {
   const totalMemory = os.totalmem();
-  const freeMemory = os.freemem();
-  const usage =
-    String(
-      Math.round(totalMemory / (1024 * 1024) - freeMemory / (1024 * 1024)) +
-        " MiB / " +
-        Math.round(totalMemory / (1024 * 1024))
-    ) + " MiB";
+  const usage = Math.round(totalMemory / (Math.pow(1024,2))/1000)+ " GB";
   return `${usage}`;
 };
diff --git a/bin/type.js b/bin/type.js
diff --git a/bin/uptime.js b/bin/uptime.js
@@ -1,7 +1,9 @@
 const os = require("os");
 
 module.exports = () => {
-  //TODO do better math
-  const uptime = String(Math.floor(os.uptime() / 60));
-  return `${uptime} mins`;
+  const full = String(Math.floor(os.uptime() / 60));
+  const hrs=String(Math.floor(full/60))
+  const mins=String(Math.floor(full % 60))
+
+  return `${hrs} hours ${mins} mins`;
 };
diff --git a/docs/tool-help.png b/docs/tool-help.png
diff --git a/docs/tool.png b/docs/tool.png
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json