Issue 4374 / 1: Fix platform identification

On Cygwin environment,
Guile's uname returns the strings of "CYGWIN_NT-6.3" etc.
It contains unnecessary strings for the platform identification,
such as Windows version.

Therefore, to remove them to return the only "cygwin".

diff --git a/scm/lily.scm b/scm/lily.scm
index 6322e0196053af7480909fc3ddbbd2d148b56e00..27ba76ab378e3d0b1670666bf323b0089f0dada6 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -41,7 +41,7 @@
 (define-public PLATFORM
   (string->symbol
    (string-downcase
-    (car (string-tokenize (utsname:sysname (uname)))))))
+    (car (string-tokenize (utsname:sysname (uname)) char-set:letter)))))
 
 ;;
 ;; Session-handling variables and procedures.

diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm
index e2a0d6cb205665eb10963ad615ea9f54cf498418..7e94ac051601cc33056cbabbeb05a42a6ac585c9 100644 (file)
--- a/scm/ps-to-png.scm
+++ b/scm/ps-to-png.scm
@@ -34,7 +34,7 @@
 (define PLATFORM
   (string->symbol
    (string-downcase
-    (car (string-tokenize (vector-ref (uname) 0) char-set:letter)))))
+    (car (string-tokenize (utsname:sysname (uname)) char-set:letter)))))
 
 (define (re-sub re sub string)
   (regexp-substitute/global #f re string 'pre sub 'post))