Changeset 45fa96 in git for Singular/LIB/sing4ti2.lib

Timestamp:

Mar 9, 2018, 2:00:41 PM (6 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

372eea8de23123686035e3b95b7280c2a804aa888ff090c8caf331f456d841b4dfcae0dab86cc3d3ce5d1bd5855860c909fa9377861c9d1b7a8e52bad75898dddf30641f4056f5755f5f4dc5fef0e9f1

Parents:

2b8fabd916aa6b62574f8289c4df15435f3c89d77b12a30e21c5626e320d213a12828d1a2dbc6084

Message:

Merge branch 'stable' into develop

File:

• Singular/LIB/sing4ti2.lib (modified) (3 diffs)

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))