From 5f2e243477c8ed76b95b715733a6cdddab48bc07 Mon Sep 17 00:00:00 2001 From: Marvin Hofer <vehnem@yahoo.de> Date: Wed, 4 Sep 2019 14:05:47 +0200 Subject: [PATCH] indent region: mappings-release.sh, generic-release.sh --- generic/generic-release.sh | 70 ++++++++++++++++++------------------ mappings/mappings-release.sh | 68 +++++++++++++++++------------------ 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/generic/generic-release.sh b/generic/generic-release.sh index ec118eb..0fbd11c 100644 --- a/generic/generic-release.sh +++ b/generic/generic-release.sh @@ -33,29 +33,29 @@ execWithLogging() { } downloadOntology() { - cd $EXTRACTIONFRAMEWORKDIR/core; - ../run download-ontology; + cd $EXTRACTIONFRAMEWORKDIR/core; + ../run download-ontology; } downloadMappings() { - cd $EXTRACTIONFRAMEWORKDIR/core; - ../run download-mappings; + cd $EXTRACTIONFRAMEWORKDIR/core; + ../run download-mappings; } downloadDumps() { - cd $EXTRACTIONFRAMEWORKDIR/dump; - ../run download $SCRIPTROOT/download.generic.properties; + cd $EXTRACTIONFRAMEWORKDIR/dump; + ../run download $SCRIPTROOT/download.generic.properties; } buildExtractionFramework() { - cd $EXTRACTIONFRAMEWORKDIR; - mvn clean install; + cd $EXTRACTIONFRAMEWORKDIR; + mvn clean install; } runExtraction() { - cd $EXTRACTIONFRAMEWORKDIR/dump; - ../run sparkextraction $SCRIPTROOT/sparkextraction.generic.properties; - ../run sparkextraction $SCRIPTROOT/sparkextraction.generic.en.properties; + cd $EXTRACTIONFRAMEWORKDIR/dump; + ../run sparkextraction $SCRIPTROOT/sparkextraction.generic.properties; + ../run sparkextraction $SCRIPTROOT/sparkextraction.generic.en.properties; } resolveTransitiveLinks() { @@ -76,9 +76,9 @@ postProcessing() { } prepareRelease() { - #own config - cd $SCRIPTROOT; - collectExtraction.sh; + #own config + cd $SCRIPTROOT; + collectExtraction.sh; } setNewVersion() { @@ -87,11 +87,11 @@ setNewVersion() { } deployRelease() { - cd $DATABUSMAVENPOMDIR; - mvn deploy \ + cd $DATABUSMAVENPOMDIR; + mvn deploy \ -Ddatabus.publisher="$RELEASEPUBLISHER" \ -Ddatabus.packageDirectory="$RELEASEPACKAGEDIR/\${project.groupId}/\${project.artifactId}" \ - -Ddatabus.downloadUrlPath="$RELEASEDOWNLOADURL/\${project.groupId}/\${project.artifactId}/\${project.version}"; + -Ddatabus.downloadUrlPath="$RELEASEDOWNLOADURL/\${project.groupId}/\${project.artifactId}/\${project.version}"; } compressLogs() { @@ -102,37 +102,37 @@ compressLogs() { main() { - echo "--------------------" >&2; - echo " Generic Extraction " >&2; - echo "--------------------" >&2; + echo "--------------------" >&2; + echo " Generic Extraction " >&2; + echo "--------------------" >&2; #download - echo "$(date) | extraction-framework | start download ontology" >&2; - execWithLogging downloadOntology; - echo "$(date) | extraction-framework | start download mappings" >&2; - execWithLogging downloadMappings; - echo "$(date) | extraction-framework | start download dumps" >&2; - execWithLogging downloadDumps; + echo "$(date) | extraction-framework | start download ontology" >&2; + execWithLogging downloadOntology; + echo "$(date) | extraction-framework | start download mappings" >&2; + execWithLogging downloadMappings; + echo "$(date) | extraction-framework | start download dumps" >&2; + execWithLogging downloadDumps; #extraction echo "$(date) | extraction-framework | mvn clean install" >&2; - execWithLogging buildExtractionFramework; + execWithLogging buildExtractionFramework; echo "$(date) | extraction-framework | start extraction" >&2; - execWithLogging runExtraction; + execWithLogging runExtraction; echo "$(date) | extraction-framework | post processing" >&2; - postProcessing; + postProcessing; - #release + #release echo "$(date) | databus-maven-plugin | collect extracted datasets" >&2; - execWithLogging prepareRelease; - echo "$(date) | databus-maven-plugin | mvn versions:set" >&2; - execWithLogging setNewVersion; + execWithLogging prepareRelease; + echo "$(date) | databus-maven-plugin | mvn versions:set" >&2; + execWithLogging setNewVersion; echo "$(date) | databus-maven-plugin | mvn deploy" >&2; - execWithLogging deployRelease; + execWithLogging deployRelease; #cleanup echo "$(date) | main | compress log files" >&2; compressLogs; } -execWithLogging main; \ No newline at end of file +execWithLogging main; diff --git a/mappings/mappings-release.sh b/mappings/mappings-release.sh index f79ad4a..c7c95ee 100755 --- a/mappings/mappings-release.sh +++ b/mappings/mappings-release.sh @@ -33,28 +33,28 @@ execWithLogging() { } downloadOntology() { - cd $EXTRACTIONFRAMEWORKDIR/core; - ../run download-ontology; + cd $EXTRACTIONFRAMEWORKDIR/core; + ../run download-ontology; } downloadMappings() { - cd $EXTRACTIONFRAMEWORKDIR/core; - ../run download-mappings; + cd $EXTRACTIONFRAMEWORKDIR/core; + ../run download-mappings; } downloadDumps() { - cd $EXTRACTIONFRAMEWORKDIR/dump; - ../run download $SCRIPTROOT/download.generic.properties; + cd $EXTRACTIONFRAMEWORKDIR/dump; + ../run download $SCRIPTROOT/download.generic.properties; } buildExtractionFramework() { - cd $EXTRACTIONFRAMEWORKDIR; - mvn clean install; + cd $EXTRACTIONFRAMEWORKDIR; + mvn clean install; } runExtraction() { - cd $EXTRACTIONFRAMEWORKDIR/dump; - ../run sparkextraction $SCRIPTROOT/extraction.mappings.properties; + cd $EXTRACTIONFRAMEWORKDIR/dump; + ../run sparkextraction $SCRIPTROOT/extraction.mappings.properties; } resolveTransitiveLinks() { @@ -75,9 +75,9 @@ postProcessing() { } prepareRelease() { - #own config - cd $SCRIPTROOT; - collectExtraction.sh; + #own config + cd $SCRIPTROOT; + collectExtraction.sh; } setNewVersion() { @@ -86,11 +86,11 @@ setNewVersion() { } deployRelease() { - cd $DATABUSMAVENPOMDIR; - mvn deploy \ + cd $DATABUSMAVENPOMDIR; + mvn deploy \ -Ddatabus.publisher="$RELEASEPUBLISHER" \ -Ddatabus.packageDirectory="$RELEASEPACKAGEDIR/\${project.groupId}/\${project.artifactId}" \ - -Ddatabus.downloadUrlPath="$RELEASEDOWNLOADURL/\${project.groupId}/\${project.artifactId}/\${project.version}"; + -Ddatabus.downloadUrlPath="$RELEASEDOWNLOADURL/\${project.groupId}/\${project.artifactId}/\${project.version}"; } compressLogs() { @@ -101,33 +101,33 @@ compressLogs() { main() { - echo "-------------------------" >&2; - echo " Mappingbased Extraction " >&2; - echo "-------------------------" >&2; + echo "-------------------------" >&2; + echo " Mappingbased Extraction " >&2; + echo "-------------------------" >&2; #download - echo "$(date) | extraction-framework | start download ontology" >&2; - execWithLogging downloadOntology; - echo "$(date) | extraction-framework | start download mappings" >&2; - execWithLogging downloadMappings; - echo "$(date) | extraction-framework | start download dumps" >&2; - execWithLogging downloadDumps; + echo "$(date) | extraction-framework | start download ontology" >&2; + execWithLogging downloadOntology; + echo "$(date) | extraction-framework | start download mappings" >&2; + execWithLogging downloadMappings; + echo "$(date) | extraction-framework | start download dumps" >&2; + execWithLogging downloadDumps; #extraction echo "$(date) | extraction-framework | mvn clean install" >&2; - execWithLogging buildExtractionFramework; + execWithLogging buildExtractionFramework; echo "$(date) | extraction-framework | start extraction" >&2; - execWithLogging runExtraction; -# echo "$(date) | extraction-framework | post processing" >&2; -# postProcessing; + execWithLogging runExtraction; + # echo "$(date) | extraction-framework | post processing" >&2; + # postProcessing; - #release + #release echo "$(date) | databus-maven-plugin | collect extracted datasets" >&2; - execWithLogging prepareRelease; - echo "$(date) | databus-maven-plugin | mvn versions:set" >&2; - execWithLogging setNewVersion; + execWithLogging prepareRelease; + echo "$(date) | databus-maven-plugin | mvn versions:set" >&2; + execWithLogging setNewVersion; echo "$(date) | databus-maven-plugin | mvn deploy" >&2; - execWithLogging deployRelease; + execWithLogging deployRelease; #cleanup echo "$(date) | main | compress log files" >&2; -- GitLab