From 73ab73fb5a0ff2e950ef1728f7bbed48542ec9d2 Mon Sep 17 00:00:00 2001
From: Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
Date: Mon, 27 Jan 2025 11:46:24 +0100
Subject: [PATCH] Add dbfarm output variable

---
 action.yml           | 3 +++
 install-linux-bin.sh | 7 +++++--
 install-macos-bin.sh | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/action.yml b/action.yml
index e8128ee..c14f1e5 100644
--- a/action.yml
+++ b/action.yml
@@ -24,6 +24,9 @@ outputs:
   versionnumber:
     description: "installed version of MonetDB, for example 11.51.5"
     value: ${{ steps.versionlookup.outputs.numeric }}
+  dbfarm:
+    description:  "location of the started dbfarm (not on Windows)"
+    value: ${{ steps.set_output.outputs.dbfarm }}
 
 # input: version
 # output: version_number
diff --git a/install-linux-bin.sh b/install-linux-bin.sh
index e16d4f2..140b285 100755
--- a/install-linux-bin.sh
+++ b/install-linux-bin.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+    #!/bin/bash
 
 set -e -x
 
@@ -72,8 +72,10 @@ install_rpms() {
 # Install the packages
 if type -P yum >/dev/null; then
     install_rpms
+    echo "dbfarm=/usr/local/dbfarm" >>github.output
 elif type -P apt-get >/dev/null; then
     install_debs
+    echo "dbfarm=/var/monetdb5/dbfarm" >>github.output
 else
     echo 'Cannot find yum or apt-get'
     exit 1
@@ -89,7 +91,7 @@ echo "dynsuffix=so" >>github.output
 
 
 # Start and create database
-sudo systemctl enable monetdbd
+#sudo systemctl enable monetdbd
 if sudo systemctl start monetdbd; then
     # running on a 'real' host
     true
@@ -100,6 +102,7 @@ else
     sudo chown monetdb:monetdb "$DBFARM"
     sudo -u monetdb monetdbd create "$DBFARM"
     sudo -u monetdb monetdbd start "$DBFARM"
+    echo "dbfarm=$DBFARM" >>github.output
 fi
 
 sudo -u monetdb monetdb create -pmonetdb demo monetdb
diff --git a/install-macos-bin.sh b/install-macos-bin.sh
index 60ec2fa..4a930c3 100755
--- a/install-macos-bin.sh
+++ b/install-macos-bin.sh
@@ -38,3 +38,4 @@ echo "bindir=$prefix/bin" >>github.output
 echo "includedir=$prefix/include/monetdb" >>github.output
 echo "libdir=$prefix/lib" >>github.output
 echo "dynsuffix=dylib" >>github.output
+echo "dbfarm=$DBFARM" >>github.output