Changeset 24ea2a in git

Timestamp:

Apr 1, 2015, 11:55:22 PM (9 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

4ec7338829b2741a2b2f4c879b9bfd0ec67f410d

Parents:

06cff955d56f17b8a3199fd8db5e3f4a6be98f35

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2015-04-01 23:55:22+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2015-04-01 23:56:32+02:00

Message:

Added surfer fallback to SURFER.app from http://www.mathematik.uni-kl.de/~motsak/files/SURFER.dmg under Mac OS X

File:

• Singular/LIB/surf.lib (modified) (4 diffs)

Singular/LIB/surf.lib

@@ -16 +16 @@
   @uref{http://www.imaginary2008.de/surfer.imaginary2008.de}
  @*Under Windows, version 159 or newer of @code{surfer} is required.
+ Under Mac OS X please move SURFER.app from http://www.mathematik.uni-kl.de/~motsak/files/SURFER.dmg
+ under your /Applications.
  @end texinfo
 
@@ -272 +274 @@
 
   string surf_call; i = 0;
+  
   if (isWindows())
   {
@@ -300 +303 @@
   else
   {
-    surf_call = "surfer " + l + " >/dev/null 2>&1";
+    surf_call = "surfer";    
+    surf_call = surf_call + " " + l + " >/dev/null 2>&1";
     "Close window to exit from `surfer`.";
     i = system("sh", surf_call);
+    
+    if ( (i != 0) && isMacOSX() ) 
+    {
+      "*!* Sorry: calling `surfer` failed ['"+surf_call+"']" + newline
+      + " (The shell returned the error code " + string(i) + "." + newline
+      + "But since we are on Mac OS X, let us try to open SURFER.app instead..." + newline 
+      + "Appropriate SURFER.app is available for instance at http://www.mathematik.uni-kl.de/~motsak/files/SURFER.dmg";
+      
+      // fallback, will only work if SURFER.app is available (e.g. in /Applications)
+      // get SURFER.app e.g. from http://www.mathematik.uni-kl.de/~motsak/files/SURFER.dmg
+      // note that the newer (Java-based) variant of Surfer may not support command line usage yet :(
+      
+      surf_call = "open -a SURFER -W --args -t -s";
+      surf_call = surf_call + " " + l + " >/dev/null 2>&1";
+      "Close window to exit from `surfer`.";
+      i = system("sh", surf_call);
+    }
+    
+    
+    
   }
   system("sh", "/bin/rm " + l);
@@ -343 +367 @@
       {
         if (s[i+2] == "n")
+        {
+          return (1);
+        }
+      }
+    }
+  }
+  return (0);
+}
+
+static proc isMacOSX()
+"returns 1 if this SINGULAR instance runs under (some) Mac OS X;
+0 otherwise"
+{
+  string s = system("uname");
+  
+  for (int i = 1; i <= size(s)-2; i = i + 1)
+  {
+    if (s[i] == "d" or s[i] == "D")
+    {
+      if (s[i+1] == "a" or s[i+1] == "A")
+      {
+        if (s[i+2] == "r" or s[i+2] == "R")
         {
           return (1);