From d43dadd71e5db2e8f6f57ac0125dd44fac749590 Mon Sep 17 00:00:00 2001
From: Mark Dokter <mark@dokter.cc>
Date: Mon, 31 Jul 2023 00:17:45 +0200
Subject: [PATCH] [MINOR] Version update; two small improvements

This commit contains three small changes before releasing DAPHNE 0.2
* Version output updated to 0.2
* Change running unminimize in entrypoint-interactive.sh to a printed hint to avoid the annoying interruption when running interactive containers
* Revert a change to run-daphne.sh that was only relevant when running in a docker container
---
 containers/entrypoint-interactive.sh | 4 +++-
 run-daphne.sh                        | 4 ++--
 src/api/internal/daphne_internal.cpp | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/containers/entrypoint-interactive.sh b/containers/entrypoint-interactive.sh
index 9b991e2eb..5d63841ca 100755
--- a/containers/entrypoint-interactive.sh
+++ b/containers/entrypoint-interactive.sh
@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-time unminimize
 /usr/sbin/sshd -f /etc/ssh/sshd_config
 /usr/sbin/groupadd -g "$GID" dockerusers
 /usr/sbin/useradd -c 'Docker Container User' -u $UID -g "$GID" -G sudo -m -s /bin/bash -d /home/"$USER" "$USER"
@@ -27,6 +26,9 @@ SALT=$(date +%M%S)
 PASS=Docker!"$SALT"
 echo "${USER}":"$PASS" | chpasswd
 echo
+echo For longer running containers consider running \'unminimize\' to update packages
+echo and make the container more suitable for interactive use.
+echo
 echo "Use "$USER" with password "$PASS" for SSH login"
 echo "Docker Container IP address(es):"
 awk '/32 host/ { print f } {f=$2}' <<< "$(</proc/net/fib_trie)" | grep -vE "127.0." | sort -u
diff --git a/run-daphne.sh b/run-daphne.sh
index 571d58eae..84bd87088 100755
--- a/run-daphne.sh
+++ b/run-daphne.sh
@@ -15,5 +15,5 @@
 # limitations under the License.
 
 DAPHNE_ROOT=$PWD
-export LD_LIBRARY_PATH=$DAPHNE_ROOT/lib:$LD_LIBRARY_PATH
-$DAPHNE_ROOT/bin/daphne --config UserConfig.json $@
+export LD_LIBRARY_PATH=$DAPHNE_ROOT/lib:$DAPHNE_ROOT/thirdparty/installed/lib:$LD_LIBRARY_PATH
+$DAPHNE_ROOT/bin/daphne --config UserConfig.json $@
\ No newline at end of file
diff --git a/src/api/internal/daphne_internal.cpp b/src/api/internal/daphne_internal.cpp
index a6e39dbb0..5165e080b 100644
--- a/src/api/internal/daphne_internal.cpp
+++ b/src/api/internal/daphne_internal.cpp
@@ -68,7 +68,7 @@ void parseScriptArgs(const llvm::cl::list<string>& scriptArgsCli, unordered_map<
 void printVersion(llvm::raw_ostream& os) {
     // TODO Include some of the important build flags into the version string.
     os
-      << "DAPHNE Version 0.2-rc2\n"
+      << "DAPHNE Version 0.2\n"
       << "An Open and Extensible System Infrastructure for Integrated Data Analysis Pipelines\n"
       << "https://github.com/daphne-eu/daphne\n";
 }