#!/bin/bash

# Use timeout if the system supports it.
if command -v timeout ; then
    TIMEOUT='timeout 10s'
else
    TIMEOUT=''
fi

if [ ${2: -5} == ".java" ] || [ ${3: -5} == ".java" ]
then
    set +e
    echo "#STATS_START"
    echo "#FILE1 | $2"
    echo "#FILE2 | $3"
    echo "#TYPE | $1"

	$TIMEOUT java -cp $CMPUT664_PROJECT/gumtree-spoon-ast-diff/target/gumtree-spoon-ast-diff-0.0.3-SNAPSHOT-jar-with-dependencies.jar fr.inria.sacha.spoon.diffSpoon.DiffSpoonImpl $1 $2 $3

    echo "#STATS_END"
fi

#!/bin/bash

TIMEOUT='timeout 10s'
if [ `uname -s` == Darwin ]; then
    TIMEOUT=''
fi

if [ ${2: -5} == ".java" ] || [ ${3: -5} == ".java" ]
then
	echo "#STATS_START"
    echo "#FILE1 | $2"
    echo "#FILE2 | $3"
    echo "#TYPE | $1"

	$TIMEOUT java -cp $CMPUT664_PROJECT/gumtree-spoon-ast-diff/target/gumtree-spoon-ast-diff-0.0.3-SNAPSHOT-jar-with-dependencies.jar fr.inria.sacha.spoon.diffSpoon.DiffSpoonImpl $1 $2 $3

	echo "#STATS_END"
fi

--- 
+++ 
@@ -1,21 +1,18 @@
 #!/bin/bash
 
-# Use timeout if the system supports it.
-if command -v timeout ; then
-    TIMEOUT='timeout 10s'
-else
+TIMEOUT='timeout 10s'
+if [ `uname -s` == Darwin ]; then
     TIMEOUT=''
 fi
 
 if [ ${2: -5} == ".java" ] || [ ${3: -5} == ".java" ]
 then
-    set +e
-    echo "#STATS_START"
+	echo "#STATS_START"
     echo "#FILE1 | $2"
     echo "#FILE2 | $3"
     echo "#TYPE | $1"
 
 	$TIMEOUT java -cp $CMPUT664_PROJECT/gumtree-spoon-ast-diff/target/gumtree-spoon-ast-diff-0.0.3-SNAPSHOT-jar-with-dependencies.jar fr.inria.sacha.spoon.diffSpoon.DiffSpoonImpl $1 $2 $3
 
-    echo "#STATS_END"
+	echo "#STATS_END"
 fi
Fix AST based on command.
