From d3a7d55edcdcf9c3531742fa3e8a83f9a13d897f Mon Sep 17 00:00:00 2001
From: kurzum <kurzum@github.com>
Date: Mon, 30 Mar 2020 11:57:23 +0200
Subject: [PATCH] total reset of marvin-extraction dir
---
functions.sh | 7 ++++---
setup-or-reset-dief.sh | 9 +++++----
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/functions.sh b/functions.sh
index 738be80..b34fe8e 100755
--- a/functions.sh
+++ b/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
diff --git a/setup-or-reset-dief.sh b/setup-or-reset-dief.sh
index 9a1611c..63263fb 100755
--- a/setup-or-reset-dief.sh
+++ b/setup-or-reset-dief.sh
@@ -1,19 +1,20 @@
#!/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
--
GitLab