Merge pull request #34 from adorsys/issue-24

Add platform-specific check for keycloak_pid in test deployment

0.start-kc-oid4vci.sh

@@ -45,11 +45,20 @@ else
 fi
 
 # Shutdown keycloak if any
-keycloak_pid=$(ps aux | grep -i '[k]eycloak' | awk '{print $2}')
-if [ -n "$keycloak_pid" ]; then
-    echo "A Keycloak instance is already running (PID: $keycloak_pid). Shutting it down..."
-    kill $keycloak_pid 
-fi
+# Determine OS platform and shutdown Keycloak if running
+OS=$(uname -s)
+case "$OS" in
+    Linux*|Darwin*)
+        keycloak_pid=$(pgrep -f keycloak)
+        if [ -n "$keycloak_pid" ]; then
+            echo "Keycloak instance found (PID: $keycloak_pid) on $OS. Shutting it down..."
+            kill $keycloak_pid
+        fi
+        ;;
+    *)
+        echo "This script supports only Linux or macOS."
+        ;;
+esac
 
 # Change to the tools directory and unpack keycloak
 if [ -d "$KC_INSTALL_DIR" ]; then

1.oid4vci_test_deployment.sh

@@ -4,12 +4,29 @@
 . .env
 
 # Ensure keycloak with oid4vc-vci profile is running
-keycloak_pid=$(ps aux | grep -i '[k]eycloak' | awk '{print $2}')
-if [ ! -n "$keycloak_pid" ]; then
-    echo "Keycloak not running. Start keycloak using 0.start-kc-oid4vci first..."
+# Function to get the Keycloak PID based on the OS
+get_keycloak_pid() {
+  if [[ "$OSTYPE" == "darwin"* ]]; then
+    # macOS
+    echo $(ps aux | grep -i '[q]uarkus' | awk '{print $2}')
+  else
+    # Linux
+    echo $(ps aux | grep -i '[k]eycloak' | awk '{print $2}')
+  fi
+}
+
+# Get the Keycloak PID
+keycloak_pid=$(get_keycloak_pid)
+
+# Check if Keycloak is running
+if [ -z "$keycloak_pid" ]; then
+    echo "Keycloak not running. Start Keycloak using 0.start-kc-oid4vci first..."
     exit 1
 fi
 
+echo "Keycloak is running with PID: $keycloak_pid"
+
+
 # Get admin token using environment variables for credentials
 echo "Obtaining admin token..."
 $KC_INSTALL_DIR/bin/kcadm.sh config truststore --trustpass $KC_TRUST_STORE_PASS $KC_TRUST_STORE