From 2fe39c46360376680340bac6c8916210dd6aadf3 Mon Sep 17 00:00:00 2001
From: "Bernhard J. Berger" <bernhard.berger@uni-bremen.de>
Date: Fri, 3 Feb 2023 15:16:41 +0100
Subject: [PATCH] Modified scripts to work in the final release.
---
ci/create-release.sh | 1 +
src/core/de.evoal.core.arff/scripts/run-arff-to-ddl.sh | 2 +-
src/core/de.evoal.core/scripts/paths.env | 4 ++--
src/core/de.evoal.core/scripts/run-search.sh | 2 +-
src/core/de.evoal.generator.main/scripts/debug-generator.sh | 2 +-
src/core/de.evoal.generator.main/scripts/run-generator.sh | 2 +-
.../scripts/debug-search-with-surrogate.sh | 2 +-
src/core/de.evoal.surrogate.api/scripts/debug-training.sh | 2 +-
.../scripts/run-search-with-surrogate.sh | 2 +-
src/core/de.evoal.surrogate.api/scripts/run-training.sh | 2 +-
10 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/ci/create-release.sh b/ci/create-release.sh
index 6ca37e52..ecbc9db9 100755
--- a/ci/create-release.sh
+++ b/ci/create-release.sh
@@ -41,6 +41,7 @@ rm -rf xtext-merge
# let's copy the scripts to the correct location
mkdir bin
+cp -r src/core/de.evoal.core/scripts/* "bin"
for NAME in $RELEASE_PLUGINS; do
echo "Copying scripts of plugin $NAME"
diff --git a/src/core/de.evoal.core.arff/scripts/run-arff-to-ddl.sh b/src/core/de.evoal.core.arff/scripts/run-arff-to-ddl.sh
index 7340a40e..7d12bf34 100755
--- a/src/core/de.evoal.core.arff/scripts/run-arff-to-ddl.sh
+++ b/src/core/de.evoal.core.arff/scripts/run-arff-to-ddl.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source paths.env
+source $( cd -- "$(dirname $0)/" >/dev/null 2>&1 ; pwd -P)/paths.env
if [ "$#" -ne 3 ]; then
echo "Usage: $0 <execution-folder> <input.arff> <output.ddl>"
diff --git a/src/core/de.evoal.core/scripts/paths.env b/src/core/de.evoal.core/scripts/paths.env
index a5824f56..dc8f4547 100644
--- a/src/core/de.evoal.core/scripts/paths.env
+++ b/src/core/de.evoal.core/scripts/paths.env
@@ -1,2 +1,2 @@
-EVOALPATH="$( cd -- "$(dirname "$0/..")" >/dev/null 2>&1 ; pwd -P )"
-PLUGIN_PATHS=`ls -d "${EVOALPATH}/plugins"/* | tr '\n' ':'`
+EVOALPATH=$( cd -- "$(dirname $0)/.." >/dev/null 2>&1 ; pwd -P )
+PLUGIN_PATHS=`ls -d "${EVOALPATH}/plugins"/* | tr '\n' ':'`
\ No newline at end of file
diff --git a/src/core/de.evoal.core/scripts/run-search.sh b/src/core/de.evoal.core/scripts/run-search.sh
index 3356f396..d559d1ac 100755
--- a/src/core/de.evoal.core/scripts/run-search.sh
+++ b/src/core/de.evoal.core/scripts/run-search.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source paths.env
+source $( cd -- "$(dirname $0)/" >/dev/null 2>&1 ; pwd -P)/paths.env
if [ "$#" -ne 3 ]; then
echo "Usage: $0 <execution-folder> <eal-file> <output-folder>"
diff --git a/src/core/de.evoal.generator.main/scripts/debug-generator.sh b/src/core/de.evoal.generator.main/scripts/debug-generator.sh
index b03ec59a..f37431e7 100755
--- a/src/core/de.evoal.generator.main/scripts/debug-generator.sh
+++ b/src/core/de.evoal.generator.main/scripts/debug-generator.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source paths.env
+source $( cd -- "$(dirname $0)/" >/dev/null 2>&1 ; pwd -P)/paths.env
if [ "$#" -ne 2 ]; then
echo "Usage: $0 <execution-folder> <generator-file>"
diff --git a/src/core/de.evoal.generator.main/scripts/run-generator.sh b/src/core/de.evoal.generator.main/scripts/run-generator.sh
index ea70931a..d60c3b38 100755
--- a/src/core/de.evoal.generator.main/scripts/run-generator.sh
+++ b/src/core/de.evoal.generator.main/scripts/run-generator.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source paths.env
+source $( cd -- "$(dirname $0)/" >/dev/null 2>&1 ; pwd -P)/paths.env
if [ "$#" -ne 2 ]; then
echo "Usage: $0 <execution-folder> <generator-file>"
diff --git a/src/core/de.evoal.surrogate.api/scripts/debug-search-with-surrogate.sh b/src/core/de.evoal.surrogate.api/scripts/debug-search-with-surrogate.sh
index 3e0ea934..1abaa842 100755
--- a/src/core/de.evoal.surrogate.api/scripts/debug-search-with-surrogate.sh
+++ b/src/core/de.evoal.surrogate.api/scripts/debug-search-with-surrogate.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source paths.env
+source $( cd -- "$(dirname $0)/" >/dev/null 2>&1 ; pwd -P)/paths.env
if [ "$#" -ne 7 ]; then
echo "Usage: $0 <execution-folder> <ea-file> <mll-file> <pre-trained.pson> <training-points.json> <output> <constraint-folder>"
diff --git a/src/core/de.evoal.surrogate.api/scripts/debug-training.sh b/src/core/de.evoal.surrogate.api/scripts/debug-training.sh
index e6a24e51..55df393d 100755
--- a/src/core/de.evoal.surrogate.api/scripts/debug-training.sh
+++ b/src/core/de.evoal.surrogate.api/scripts/debug-training.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source paths.env
+source $( cd -- "$(dirname $0)/" >/dev/null 2>&1 ; pwd -P)/paths.env
if [ "$#" -ne 2 ]; then
echo "Usage: $0 <execution-folder> <mll-file>"
diff --git a/src/core/de.evoal.surrogate.api/scripts/run-search-with-surrogate.sh b/src/core/de.evoal.surrogate.api/scripts/run-search-with-surrogate.sh
index b1cafeb9..c1f7e30b 100755
--- a/src/core/de.evoal.surrogate.api/scripts/run-search-with-surrogate.sh
+++ b/src/core/de.evoal.surrogate.api/scripts/run-search-with-surrogate.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source paths.env
+source $( cd -- "$(dirname $0)/" >/dev/null 2>&1 ; pwd -P)/paths.env
if [ "$#" -ne 7 ]; then
echo "Usage: $0 <execution-folder> <ea-file> <mll-file> <pre-trained.pson> <training-points.json> <output> <constraint-folder>"
diff --git a/src/core/de.evoal.surrogate.api/scripts/run-training.sh b/src/core/de.evoal.surrogate.api/scripts/run-training.sh
index 7c8572e8..6e88a613 100755
--- a/src/core/de.evoal.surrogate.api/scripts/run-training.sh
+++ b/src/core/de.evoal.surrogate.api/scripts/run-training.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source paths.env
+source $( cd -- "$(dirname $0)/" >/dev/null 2>&1 ; pwd -P)/paths.env
if [ "$#" -ne 2 ]; then
echo "Usage: $0 <execution-folder> <mll-file>"
--
GitLab