Changeset 586 for CMIP6dreq/trunk/dreqPy/simpleCheck.py

Timestamp:

02/02/16 15:41:42 (5 years ago)

Author:

mjuckes

Message:

Updated setup for tag 01.beta.19

File:

• CMIP6dreq/trunk/dreqPy/simpleCheck.py (modified) (3 diffs)

CMIP6dreq/trunk/dreqPy/simpleCheck.py

@@ -1 +1 @@
 from __init__ import DOC_DIR
-import string, os
+import string, os, sys
 
 try:
@@ -44 +44 @@
     self.lab = lab
     self.ok = True
+    self.entryPoint = sys.argv[0].split( '/' )[-1]
 
 #document directory
@@ -94 +95 @@
   def _ch04_checkCmd(self):
     import os
-    os.popen( 'python dreqCmdl.py -v  2> .simpleCheck_check2_err.txt 1>.simpleCheck_check2.txt' ).readlines()
+    if self.entryPoint == 'drq':
+       cmd = 'drq'
+    else:
+       cmd = 'python dreqCmdl.py'
+
+    os.popen( '%s -v  2> .simpleCheck_check2_err.txt 1>.simpleCheck_check2.txt' % cmd ).readlines()
+
     ii = open( '.simpleCheck_check2_err.txt' ).readlines()
     if len(ii) > 0: