Merge remote-tracking branch 'origin/master'

functions.sh

@@ -15,10 +15,11 @@ usage:
 
 ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 CONFIGDIR="$ROOT/extractionConfiguration"
-DIEFDIR="$ROOT/marvin-extraction/extraction-framework"
-LOGDIR="$ROOT/marvin-extraction/logs/$(date +%Y-%m-%d)"  && mkdir -p $LOGDIR
-EXTRACTIONBASEDIR="$ROOT/marvin-extraction/wikidumps" && mkdir -p $EXTRACTIONBASEDIR
+LOGDIR="$ROOT/logs/$(date +%Y-%m-%d)"  && mkdir -p $LOGDIR
 DATABUSDIR="$ROOT/databus-poms"
+MARVINEXTRACTIONDIR="$ROOT/marvin-extraction/"
+DIEFDIR="$MARVINEXTRACTIONDIR/extraction-framework"
+EXTRACTIONBASEDIR="$MARVINEXTRACTIONDIR/wikidumps" && mkdir -p $EXTRACTIONBASEDIR
 
 ##############
 # functions

setup-or-reset-dief.sh

 #!/bin/bash
 
-# get all variables and functions
+# get all variables and functions and mkdirs
 source functions.sh
 
+# delete and clone
+rm -r $MARVINEXTRACTIONDIR/*
 cd marvin-extraction
 git clone "https://github.com/dbpedia/extraction-framework.git" $DIEFDIR &>/dev/null
 cd $DIEFDIR
 # reset the ontology and some files that are changes
-git stash
-git pull
+mvn clean install 2>&1 | tee $LOGDIR/installDIEF.log
+
 
 # concat universial props
 echo "base-dir=$EXTRACTIONBASEDIR" > $DIEFDIR/core/src/main/resources/universal.properties 
 echo "log-dir=$LOGDIR/extraction/" >> $DIEFDIR/core/src/main/resources/universal.properties  
 cat $CONFIGDIR/universal.properties.template >> $DIEFDIR/core/src/main/resources/universal.properties 
 
-mvn clean install 2>&1 | tee $LOGDIR/installDIEF.log