Merge pull request #4 from goodmind/development

Development
goodmind · Mar 12, 2017 · 718c351 · 718c351
2 parents 794cd65 + 3f89a0d
commit 718c351
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/infornography-macos.rkt b/infornography-macos.rkt
@@ -48,18 +48,23 @@
                        (number->string total) "M")
                  "")))
 
-(define (os)
+(define (kernel)
   (string-trim (-> "uname -s")))
 
+(define (os)
+  (let* ((os-name (-> "sw_vers -productName")) 
+         (os-version (-> "sw_vers -productVersion")))
+    (string-join (map string-trim (list os-name os-version)))))
+
 (define data (list "
                   .......
               ...............           " ($ USER) "@" (hostname) "
             ....................        Shell: " ($ SHELL) "
           .........................     Memory: " (memory) "
-         ...........................    OS: " (os) "
-        .............................   Terminal: " ($ TERM) "
-       ...............................  CPU: " (cpu) "
-       ..............x................
+         ...........................    Kernel: " (kernel) "
+        .............................   OS: " (os) "
+       ...............................  Terminal: " ($ TERM) "
+       ..............x................  CPU: " (cpu) "
        ............xo@................
        ...........xoo@xxx.............
       ........o@oxxoo@@@@@@x..xx.....

diff --git a/infornography.rkt b/infornography.rkt
@@ -49,18 +49,18 @@
                        (number->string total) "M")
                  "")))
 
-(define (os)
+(define (kernel)
   (string-trim (-> "uname -s")))
 
 (define data (list "
                   .......
               ...............           " ($ USER) "@" (hostname) "
             ....................        Shell: " ($ SHELL) "
           .........................     Memory: " (memory) "
-         ...........................    OS: " (os) "
-        .............................   Terminal: " ($ TERM) "
-       ...............................  CPU: " (cpu) "
-       ..............x................
+         ...........................    Kernel: " (kernel) "
+        .............................   OS: Linux
+       ...............................  Terminal: " ($ TERM) " 
+       ..............x................  CPU: " (cpu) " 
        ............xo@................
        ...........xoo@xxx.............
       ........o@oxxoo@@@@@@x..xx.....