Changeset f59699 in git

Timestamp:

Mar 2, 2018, 5:18:47 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

5476e835acab56cf4309cd4b15ea0f538a678021

Parents:

74161f1b94f54d9d1994711089b0d75dec967cb3

Message:

port: debian installs 4ti2 binaries with prefix 4ti2-

Location:

Singular/LIB

Files:

• multigrading.lib (modified) (2 diffs)
• sing4ti2.lib (modified) (3 diffs)

Singular/LIB/multigrading.lib

@@ -3119 +3119 @@
 "
 {
-   if( system("sh","which hilbert 2> /dev/null 1> /dev/null") != 0 )
+   // find the name of hilbert/4ti2-hilbert
+   string s_name=system("executable","hilbert");
+   if (size(s_name)==0) { s_name=system("executable","4ti2-hilbert"); /* debian*/ }
+
+   if( size(s_name)==0 )
    {
      ERROR("Sorry: cannot find 'hilbert' command from 4ti2. Please install 4ti2!");
@@ -3177 +3181 @@
 
 
-   j=system("sh","hilbert -q sing4ti2 >/dev/null 2>&1"); ////////// be quiet + no loggin!!!
+   j=system("sh",s_name+" -q sing4ti2 >/dev/null 2>&1"); ////////// be quiet + no loggin!!!
 
    j=system("sh", "awk \'BEGIN{ORS=\",\";}{print $0;}\' sing4ti2.hil " +

Singular/LIB/sing4ti2.lib

@@ -90 +90 @@
 // using standard unix commands
 //----------------------------------------------------------------------
-   j=system("sh","markov sing4ti2 >/dev/null 2>&1");
+   // find the name of markov/4ti2-markov
+   string s_name=system("executable","markov");
+   if (size(s_name)==0) { s_name=system("executable","4ti2-markov"); /* debian*/ }
+   j=system("sh",s_name+" sing4ti2 >/dev/null 2>&1");
    j=system("sh","awk \'BEGIN{ORS=\",\";}{print $0;}\' sing4ti2.mar | sed s/[\\\ \\\t\\\v\\\f]/,/g | sed s/,+/,/g|sed s/,,/,/g|sed s/,,/,/g > sing4ti2.converted");
    if(!defined(keepfiles))
@@ -212 +215 @@
 // using standard unix commands
 //----------------------------------------------------------------------
-   j=system("sh","graver sing4ti2 >/dev/null 2>&1");
+   // find the name of graver/4ti2-graver
+   string s_name=system("executable","graver");
+   if (size(s_name)==0) { s_name=system("executable","4ti2-graver"); /* debian*/ }
+   j=system("sh",s_name+" sing4ti2 >/dev/null 2>&1");
    j=system("sh","awk \'BEGIN{ORS=\",\";}{print $0;}\' sing4ti2.gra | sed s/[\\\ \\\t\\\v\\\f]/,/g | sed s/,+/,/g |sed s/,,/,/g|sed s/,,/,/g > sing4ti2.converted");
    if(!defined(keepfiles))
    {
-      j=system("sh",("rm -f sing4ti2.gra sing4ti2."+fileending));
+     j=system("sh",("rm -f sing4ti2.gra sing4ti2."+fileending));
    }
 //----------------------------------------------------------------------
@@ -332 +338 @@
 // using standard unix commands
 //----------------------------------------------------------------------
-   j=system("sh","hilbert sing4ti2 >/dev/null 2>&1");
+   // find the name of hilbert/4ti2-hilbert
+   string s_name=system("executable","hilbert");
+   if (size(s_name)==0) { s_name=system("executable","4ti2-hilbert"); /* debian*/ }
+   j=system("sh",s_name+" sing4ti2 >/dev/null 2>&1");
    j=system("sh","awk \'BEGIN{ORS=\",\";}{print $0;}\' sing4ti2.hil | sed s/[\\\ \\\t\\\v\\\f]/,/g | sed s/,+/,/g |sed s/,,/,/g|sed s/,,/,/g > sing4ti2.converted");
    if(!defined(keepfiles))