feat(hanatool): Add path discovery for hdbsql

Refactored the compressed tenant backup process to use a temporary directory within the specified TARGET_PATH, aligning its behavior with schema exports. This change avoids the use of the /tmp directory, which can be too small for large backups.

- Create a temporary directory in TARGET_PATH for the backup.
- Perform the tenant backup into this temporary directory.
- Compress the backup files to a .tar.gz archive in TARGET_PATH.
- Clean up the temporary backup directory after compression.
- Bumped hanatool.sh version to 1.5.2.
- Updated hanatool version in packages.conf to 1.5.2.

aurora/aurora.conf

@@ -1,5 +1,6 @@
 # Configuration for the Aurora Refresh Script (aurora_refresh.sh)
 # Place this file in the same directory as the script.
+# Author: Tomi Eckert
 
 # --- Main Settings ---
 

aurora/aurora.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 # Version: 2.1.0
+# Author: Tomi Eckert
 #
 # Purpose: Performs an automated refresh of a SAP HANA schema. It exports a
 #          production schema and re-imports it under a new name ("Aurora")

b1.gen.sh

@@ -0,0 +1,256 @@
+#!/bin/bash
+
+# Author: Tomi Eckert
+# ==============================================================================
+# SAP Business One for HANA Silent Installation Configurator
+# ==============================================================================
+# This script interactively collects necessary details to customize the
+# silent installation properties file for SAP Business One on HANA.
+# It provides sensible defaults and generates the final 'install.properties'.
+# ==============================================================================
+
+# --- Function to display a welcome header ---
+print_header() {
+    echo "======================================================"
+    echo "  SAP Business One for HANA Installation Configurator "
+    echo "======================================================"
+    echo "Please provide the following details. Defaults are in [brackets]."
+    echo ""
+}
+
+# --- Function to read password securely (single entry) ---
+read_password() {
+    local prompt_text=$1
+    local -n pass_var=$2 # Use a nameref to pass the variable name
+    
+    # Loop until the entered password is not empty
+    while true; do
+        read -s -p "$prompt_text: " pass_var
+        echo
+        if [ -z "$pass_var" ]; then
+            echo "Password cannot be empty. Please try again."
+        else
+            break
+        fi
+    done
+}
+
+# --- Function to read and verify password securely ---
+read_password_verify() {
+    local prompt_text=$1
+    local -n pass_var=$2 # Use a nameref to pass the variable name
+    local pass_verify
+    
+    # Loop until the entered passwords match and are not empty
+    while true; do
+        read -s -p "$prompt_text: " pass_var
+        echo
+        if [ -z "$pass_var" ]; then
+            echo "Password cannot be empty. Please try again."
+            continue
+        fi
+
+        read -s -p "Confirm password: " pass_verify
+        echo
+
+        if [ "$pass_var" == "$pass_verify" ]; then
+            break
+        else
+            echo "Passwords do not match. Please try again."
+            echo ""
+        fi
+    done
+}
+
+# --- Main configuration logic ---
+print_header
+
+# --- Installation Type ---
+echo "--- Installation Type ---"
+read -p "Is this a new installation or are you reconfiguring an existing instance? (new/reconfigure) [new]: " install_type
+install_type=${install_type:-new}
+
+if [[ "$install_type" == "reconfigure" ]]; then
+    LANDSCAPE_INSTALL_ACTION="connect"
+    B1S_SHARED_FOLDER_OVERWRITE="false"
+else
+    LANDSCAPE_INSTALL_ACTION="create"
+    B1S_SHARED_FOLDER_OVERWRITE="true"
+fi
+echo ""
+
+
+# 1. Get Hostname/IP Details
+# Default to the current machine's hostname.
+DEFAULT_HOSTNAME=$(hostname)
+read -p "Enter HANA Database Server Hostname or IP [${DEFAULT_HOSTNAME}]: " HANA_DATABASE_SERVERS
+HANA_DATABASE_SERVERS=${HANA_DATABASE_SERVERS:-$DEFAULT_HOSTNAME}
+
+# 2. Get HANA Instance Details
+read -p "Enter HANA Database Instance Number [00]: " HANA_DATABASE_INSTANCE
+HANA_DATABASE_INSTANCE=${HANA_DATABASE_INSTANCE:-00}
+
+# 3. Get HANA SID to construct the admin user
+read -p "Enter HANA SID (Tenant Name) [NDB]: " HANA_SID
+HANA_SID=${HANA_SID:-NDB}
+# Convert SID to lowercase and append 'adm'
+HANA_DATABASE_ADMIN_ID=$(echo "${HANA_SID}" | tr '[:upper:]' '[:lower:]')adm
+
+# 4. Get Passwords
+echo ""
+echo "--- Secure Password Entry ---"
+read_password "Enter password for HANA Admin ('${HANA_DATABASE_ADMIN_ID}')" HANA_DATABASE_ADMIN_PASSWD
+
+# 5. Get HANA Database User
+read -p "Enter HANA Database User ID [SYSTEM]: " HANA_DATABASE_USER_ID
+HANA_DATABASE_USER_ID=${HANA_DATABASE_USER_ID:-SYSTEM}
+
+# 6. Get HANA User Password
+read_password "Enter password for HANA User ('${HANA_DATABASE_USER_ID}')" HANA_DATABASE_USER_PASSWORD
+
+# 7. Get SLD and Site User Details
+echo ""
+echo "--- System Landscape Directory (SLD) ---"
+read -p "Enter SLD Service Port [40000]: " SERVICE_PORT
+SERVICE_PORT=${SERVICE_PORT:-40000}
+
+read -p "Enter SLD Site User ID [B1SiteUser]: " SITE_USER_ID
+SITE_USER_ID=${SITE_USER_ID:-B1SiteUser}
+
+read_password_verify "Enter password for Site User ('${SITE_USER_ID}')" SITE_USER_PASSWORD
+
+# --- SLD Single Sign-On (SSO) Settings ---
+echo ""
+echo "--- SLD Single Sign-On (SSO) Settings ---"
+read -p "Do you want to configure Active Directory SSO? [y/N]: " configure_sso
+
+if [[ "$configure_sso" =~ ^[yY]$ ]]; then
+    SLD_WINDOWS_DOMAIN_ACTION="use"
+    read -p "Enter AD Domain Controller: " SLD_WINDOWS_DOMAIN_CONTROLLER
+    read -p "Enter AD Domain Name: " SLD_WINDOWS_DOMAIN_NAME
+    read -p "Enter AD Domain User ID: " SLD_WINDOWS_DOMAIN_USER_ID
+    read_password "Enter password for AD Domain User ('${SLD_WINDOWS_DOMAIN_USER_ID}')" SLD_WINDOWS_DOMAIN_USER_PASSWORD
+else
+    SLD_WINDOWS_DOMAIN_ACTION="skip"
+    SLD_WINDOWS_DOMAIN_CONTROLLER=""
+    SLD_WINDOWS_DOMAIN_NAME=""
+    SLD_WINDOWS_DOMAIN_USER_ID=""
+    SLD_WINDOWS_DOMAIN_USER_PASSWORD=""
+fi
+
+# 10. & 11. Get Service Layer Load Balancer Details
+echo ""
+echo "--- Service Layer ---"
+read -p "Enter Service Layer Load Balancer Port [50000]: " SL_LB_PORT
+SL_LB_PORT=${SL_LB_PORT:-50000}
+
+read -p "How many Service Layer member nodes should be configured? [2]: " SL_MEMBER_COUNT
+SL_MEMBER_COUNT=${SL_MEMBER_COUNT:-2}
+
+# Generate the SL_LB_MEMBERS string
+SL_LB_MEMBERS=""
+for (( i=1; i<=SL_MEMBER_COUNT; i++ )); do
+    port=$((50000 + i))
+    member="${HANA_DATABASE_SERVERS}:${port}"
+    if [ -z "$SL_LB_MEMBERS" ]; then
+        SL_LB_MEMBERS="$member"
+    else
+        SL_LB_MEMBERS="$SL_LB_MEMBERS,$member"
+    fi
+done
+
+# 12. Display Summary and Ask for Confirmation
+clear
+echo "======================================================"
+echo "              Configuration Summary"
+echo "======================================================"
+echo ""
+echo " --- Installation & System Details ---"
+echo " INSTALLATION_FOLDER=/usr/sap/SAPBusinessOne"
+echo " LANDSCAPE_INSTALL_ACTION=${LANDSCAPE_INSTALL_ACTION}"
+echo " B1S_SHARED_FOLDER_OVERWRITE=${B1S_SHARED_FOLDER_OVERWRITE}"
+echo ""
+echo " --- SAP HANA Database Server Details ---"
+echo " HANA_DATABASE_SERVERS=${HANA_DATABASE_SERVERS}"
+echo " HANA_DATABASE_INSTANCE=${HANA_DATABASE_INSTANCE}"
+echo " HANA_DATABASE_ADMIN_ID=${HANA_DATABASE_ADMIN_ID}"
+echo " HANA_DATABASE_ADMIN_PASSWD=[hidden]"
+echo ""
+echo " --- SAP HANA Database User ---"
+echo " HANA_DATABASE_USER_ID=${HANA_DATABASE_USER_ID}"
+echo " HANA_DATABASE_USER_PASSWORD=[hidden]"
+echo ""
+echo " --- System Landscape Directory (SLD) Details ---"
+echo " SERVICE_PORT=${SERVICE_PORT}"
+echo " SITE_USER_ID=${SITE_USER_ID}"
+echo " SITE_USER_PASSWORD=[hidden]"
+echo ""
+echo " --- SLD Single Sign-On (SSO) ---"
+echo " SLD_WINDOWS_DOMAIN_ACTION=${SLD_WINDOWS_DOMAIN_ACTION}"
+if [ "$SLD_WINDOWS_DOMAIN_ACTION" == "use" ]; then
+    echo " SLD_WINDOWS_DOMAIN_CONTROLLER=${SLD_WINDOWS_DOMAIN_CONTROLLER}"
+    echo " SLD_WINDOWS_DOMAIN_NAME=${SLD_WINDOWS_DOMAIN_NAME}"
+    echo " SLD_WINDOWS_DOMAIN_USER_ID=${SLD_WINDOWS_DOMAIN_USER_ID}"
+    echo " SLD_WINDOWS_DOMAIN_USER_PASSWORD=[hidden]"
+fi
+echo ""
+echo " --- Service Layer ---"
+echo " SL_LB_PORT=${SL_LB_PORT}"
+echo " SL_LB_MEMBERS=${SL_LB_MEMBERS}"
+echo ""
+echo "======================================================"
+read -p "Save this configuration to 'install.properties'? [y/N]: " confirm
+echo ""
+
+if [[ ! "$confirm" =~ ^[yY]$ ]]; then
+    echo "Configuration cancelled by user."
+    exit 1
+fi
+
+# --- Write the final install.properties file ---
+# Using a HEREDOC to write the configuration file with the variables collected.
+cat > install.properties << EOL
+# SAP Business One for HANA Silent Installation Properties
+# Generated by configuration script on $(date)
+
+INSTALLATION_FOLDER=/usr/sap/SAPBusinessOne
+
+HANA_DATABASE_SERVERS=${HANA_DATABASE_SERVERS}
+HANA_DATABASE_INSTANCE=${HANA_DATABASE_INSTANCE}
+HANA_DATABASE_ADMIN_ID=${HANA_DATABASE_ADMIN_ID}
+HANA_DATABASE_ADMIN_PASSWD=${HANA_DATABASE_ADMIN_PASSWD}
+
+HANA_DATABASE_USER_ID=${HANA_DATABASE_USER_ID}
+HANA_DATABASE_USER_PASSWORD=${HANA_DATABASE_USER_PASSWORD}
+
+SERVICE_PORT=${SERVICE_PORT}
+SLD_DATABASE_NAME=SLDDATA
+SLD_CERTIFICATE_ACTION=self
+CONNECTION_SSL_CERTIFICATE_VERIFICATION=false
+SLD_DATABASE_ACTION=create
+SLD_SERVER_PROTOCOL=https
+SITE_USER_ID=${SITE_USER_ID}
+SITE_USER_PASSWORD=${SITE_USER_PASSWORD}
+
+# --- SLD Single Sign-On (SSO) Settings ---
+SLD_WINDOWS_DOMAIN_ACTION=${SLD_WINDOWS_DOMAIN_ACTION}
+SLD_WINDOWS_DOMAIN_CONTROLLER=${SLD_WINDOWS_DOMAIN_CONTROLLER}
+SLD_WINDOWS_DOMAIN_NAME=${SLD_WINDOWS_DOMAIN_NAME}
+SLD_WINDOWS_DOMAIN_USER_ID=${SLD_WINDOWS_DOMAIN_USER_ID}
+SLD_WINDOWS_DOMAIN_USER_PASSWORD=${SLD_WINDOWS_DOMAIN_USER_PASSWORD}
+
+SL_LB_MEMBER_ONLY=false
+SL_LB_PORT=${SL_LB_PORT}
+SL_LB_MEMBERS=${SL_LB_MEMBERS}
+SL_THREAD_PER_SERVER=10
+
+SELECTED_FEATURES=B1ServerTools,B1ServerToolsLandscape,B1ServerToolsSLD,B1ServerToolsLicense,B1ServerToolsJobService,B1ServerToolsXApp,B1SLDAgent,B1BackupService,B1Server,B1ServerSHR,B1ServerHelp,B1AnalyticsPlatform,B1ServerCommonDB,B1ServiceLayerComponent
+
+B1S_SAMBA_AUTOSTART=true
+B1S_SHARED_FOLDER_OVERWRITE=${B1S_SHARED_FOLDER_OVERWRITE}
+LANDSCAPE_INSTALL_ACTION=${LANDSCAPE_INSTALL_ACTION}
+EOL
+
+echo "Success! The configuration file 'install.properties' has been created in the current directory."
+exit 0
+

backup/backup.conf

@@ -1,12 +1,10 @@
 # ==============================================================================
 # Configuration for HANA Backup Script (backup.sh)
 # ==============================================================================
+# Author: Tomi Eckert
 
 # --- Connection Settings ---
 
-# Full path to the SAP HANA hdbsql executable.
-HDBSQL_PATH="/usr/sap/hdbclient/hdbsql"
-
 # User key name from the hdbuserstore.
 # This key should be configured to connect to the target tenant database.
 USER_KEY="CRONKEY"

backup/backup.hook.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+# Author: Tomi Eckert
 # This script helps to configure backup.conf
 
 # Source the backup.conf to get current values

backup/backup.sh

@@ -1,18 +1,20 @@
 #!/bin/bash
-# Version: 1.0.5
+# Version: 1.0.8
+# Author: Tomi Eckert
 # ==============================================================================
 # SAP HANA Backup Script
 #
 # Performs schema exports for one or more schemas and/or tenant backups for a
-# SAP HANA database. Designed to be executed via a cronjob.
+# SAP HANA database using hanatool.sh. Designed to be executed via a cronjob.
 # Reads all settings from the backup.conf file in the same directory.
 # ==============================================================================
 
 # --- Configuration and Setup ---
 
-# Find the script's own directory to locate the config file
+# Find the script's own directory to locate the config file and hanatool.sh
 SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
 CONFIG_FILE="${SCRIPT_DIR}/backup.conf"
+HANATOOL_PATH="${SCRIPT_DIR}/hanatool.sh" # Assuming hanatool.sh is in the parent directory
 
 # Check for config file and source it
 if [[ -f "$CONFIG_FILE" ]]; then
@@ -22,176 +24,101 @@ else
     exit 1
 fi
 
-# Check if hdbsql executable exists
-if [[ ! -x "$HDBSQL_PATH" ]]; then
-    echo "❌ Error: hdbsql not found or not executable at '${HDBSQL_PATH}'"
+# Check if hanatool.sh executable exists
+if [[ ! -x "$HANATOOL_PATH" ]]; then
+    echo "❌ Error: hanatool.sh not found or not executable at '${HANATOOL_PATH}'"
     exit 1
 fi
 
-# Calculate threads to use (half of the available cores, but at least 1)
-TOTAL_THREADS=$(nproc --all)
-THREADS=$((TOTAL_THREADS / 2))
-if [[ "$THREADS" -eq 0 ]]; then
-    THREADS=1
-fi
-
-# --- Functions ---
-
-# Performs a binary export of a specific schema.
-# Accepts the schema name as its first argument.
-perform_schema_export() {
-    local schema_name="$1"
-    if [[ -z "$schema_name" ]]; then
-        echo "   ❌ Error: No schema name provided to perform_schema_export function."
-        return 1
-    fi
-
-    echo "⬇️  Starting schema export for '${schema_name}'..."
-
-    local timestamp
-    timestamp=$(date +%Y%m%d_%H%M%S)
-    local export_base_dir="${BACKUP_BASE_DIR}/schema"
-    local export_path="${export_base_dir}/${schema_name}_${timestamp}"
-    local query_export_path="$export_path"
-
-    if [[ "$COMPRESS_SCHEMA" == "true" ]]; then
-        export_path="${export_base_dir}/tmp/${schema_name}_${timestamp}"
-        query_export_path="$export_path"
-        echo "   ℹ️ Compression enabled. Using temporary export path: ${export_path}"
-    fi
-
-    local archive_file="${export_base_dir}/${schema_name}_${timestamp}.tar.gz"
-
-    mkdir -p "$(dirname "$export_path")"
-
-    local query="EXPORT \"${schema_name}\".\"*\" AS BINARY INTO '${query_export_path}' WITH REPLACE THREADS ${THREADS};"
-
-    "$HDBSQL_PATH" -U "$USER_KEY" "$query" > /dev/null 2>&1
-    local exit_code=$?
-
-    if [[ "$exit_code" -eq 0 ]]; then
-        echo "   ✅ Successfully exported schema '${schema_name}'."
-
-        if [[ "$COMPRESS_SCHEMA" == "true" ]]; then
-            echo "   🗜️  Compressing exported files..."
-            tar -czf "$archive_file" -C "$(dirname "$export_path")" "$(basename "$export_path")"
-            local tar_exit_code=$?
-
-            if [[ "$tar_exit_code" -eq 0 ]]; then
-                echo "   ✅ Successfully created archive '${archive_file}'."
-                echo "   🧹 Cleaning up temporary directory..."
-                rm -rf "$export_path"
-                rmdir --ignore-fail-on-non-empty "$(dirname "$export_path")"
-                echo "   ✨ Cleanup complete."
-            else
-                echo "   ❌ Error: Failed to compress '${export_path}'."
-            fi
-        else
-            echo "   ℹ️ Compression disabled. Raw export files are located at '${export_path}'."
-        fi
-    else
-        echo "   ❌ Error: Failed to export schema '${schema_name}' (hdbsql exit code: ${exit_code})."
-    fi
-}
-
-# Loops through the schemas in the config file and runs an export for each.
-run_all_schema_exports() {
-    if [[ -z "$SCHEMA_NAMES" ]]; then
-        echo "   ⚠️  Warning: SCHEMA_NAMES variable is not set in config. Skipping schema export."
-        return
-    fi
-
-    echo "🔎 Found schemas to export: ${SCHEMA_NAMES}"
-    for schema in $SCHEMA_NAMES; do
-        perform_schema_export "$schema"
-        echo "--------------------------------------------------"
-    done
-}
-
-# REFACTORED: Generic function to back up any database (Tenant or SYSTEMDB).
-# Arguments: 1:Backup Name (for logging), 2:User Key, 3:Base Directory, 4:Compression Flag
-perform_database_backup() {
-    local backup_name="$1"
-    local user_key="$2"
-    local backup_base_dir="$3"
-    local compress_enabled="$4"
-
-    echo "⬇️  Starting ${backup_name} backup..."
-
-    local timestamp
-    timestamp=$(date +%Y%m%d_%H%M%S)
-    local backup_path_prefix
-    local backup_target_dir
-
-    if [[ "$compress_enabled" == "true" ]]; then
-        backup_target_dir="${backup_base_dir}/tmp"
-        backup_path_prefix="${backup_target_dir}/backup_${timestamp}"
-        echo "   ℹ️ Compression enabled. Using temporary backup path: ${backup_path_prefix}"
-    else
-        backup_target_dir="$backup_base_dir"
-        backup_path_prefix="${backup_target_dir}/backup_${timestamp}"
-    fi
-
-    mkdir -p "$backup_target_dir"
-
-    local query="BACKUP DATA USING FILE ('${backup_path_prefix}')"
-
-    "$HDBSQL_PATH" -U "$user_key" "$query" > /dev/null 2>&1
-    local exit_code=$?
-
-    if [[ "$exit_code" -eq 0 ]]; then
-        echo "   ✅ Successfully initiated ${backup_name} backup with prefix '${backup_path_prefix}'."
-
-        if [[ "$compress_enabled" == "true" ]]; then
-            local archive_file="${backup_base_dir}/backup_${timestamp}.tar.gz"
-            echo "   🗜️  Compressing backup files..."
-            tar -czf "$archive_file" -C "$backup_target_dir" .
-            local tar_exit_code=$?
-
-            if [[ "$tar_exit_code" -eq 0 ]]; then
-                echo "   ✅ Successfully created archive '${archive_file}'."
-                echo "   🧹 Cleaning up temporary directory..."
-                rm -rf "$backup_target_dir"
-                echo "   ✨ Cleanup complete."
-            else
-                echo "   ❌ Error: Failed to compress backup files in '${backup_target_dir}'."
-            fi
-        fi
-    else
-        echo "   ❌ Error: Failed to initiate ${backup_name} backup (hdbsql exit code: ${exit_code})."
-    fi
-}
-
 # --- Main Execution ---
 
-echo "⚙️  Starting HANA backup process..."
+echo "⚙️  Starting HANA backup process using hanatool.sh..."
 
 mkdir -p "$BACKUP_BASE_DIR"
 
+SCHEMA_EXPORT_OPTIONS=""
+
 case "$BACKUP_TYPE" in
     schema)
-        run_all_schema_exports
+        if [[ -z "$SCHEMA_NAMES" ]]; then
+            echo "   ⚠️  Warning: SCHEMA_NAMES variable is not set in config. Skipping schema export."
+        else
+            echo "🔎 Found schemas to export: ${SCHEMA_NAMES}"
+            for schema in $SCHEMA_NAMES; do
+                echo "⬇️  Starting schema export for '${schema}'..."
+                SCHEMA_EXPORT_OPTIONS="$COMMON_OPTIONS"
+                if [[ "$COMPRESS_SCHEMA" == "true" ]]; then
+                    SCHEMA_EXPORT_OPTIONS+=" --compress"
+                fi
+                "$HANATOOL_PATH" "$USER_KEY" export "$schema" "${BACKUP_BASE_DIR}/schema" $SCHEMA_EXPORT_OPTIONS
+                if [[ $? -ne 0 ]]; then
+                    echo "❌ Error: Schema export for '${schema}' failed."
+                fi
+                echo "--------------------------------------------------"
+            done
+        fi
         ;;
     tenant)
-        perform_database_backup "Tenant" "$USER_KEY" "${BACKUP_BASE_DIR}/tenant" "$COMPRESS_TENANT"
+        echo "⬇️  Starting Tenant backup..."
+        TENANT_BACKUP_OPTIONS="$COMMON_OPTIONS"
+        if [[ "$COMPRESS_TENANT" == "true" ]]; then
+            TENANT_BACKUP_OPTIONS+=" --compress"
+        fi
+        "$HANATOOL_PATH" "$USER_KEY" backup "${BACKUP_BASE_DIR}/tenant" $TENANT_BACKUP_OPTIONS
+        if [[ $? -ne 0 ]]; then
+            echo "❌ Error: Tenant backup failed."
+        fi
         ;;
     all)
-        run_all_schema_exports
-        perform_database_backup "Tenant" "$USER_KEY" "${BACKUP_BASE_DIR}/tenant" "$COMPRESS_TENANT"
+        if [[ -z "$SCHEMA_NAMES" ]]; then
+            echo "   ⚠️  Warning: SCHEMA_NAMES variable is not set in config. Skipping schema export."
+        else
+            echo "🔎 Found schemas to export: ${SCHEMA_NAMES}"
+            for schema in $SCHEMA_NAMES; do
+                echo "⬇️  Starting schema export for '${schema}'..."
+                SCHEMA_EXPORT_OPTIONS="$COMMON_OPTIONS"
+                if [[ "$COMPRESS_SCHEMA" == "true" ]]; then
+                    SCHEMA_EXPORT_OPTIONS+=" --compress"
+                fi
+                "$HANATOOL_PATH" "$USER_KEY" export "$schema" "${BACKUP_BASE_DIR}/schema" $SCHEMA_EXPORT_OPTIONS
+                if [[ $? -ne 0 ]]; then
+                    echo "❌ Error: Schema export for '${schema}' failed."
+                fi
+                echo "--------------------------------------------------"
+            done
+        fi
+
+        echo "⬇️  Starting Tenant backup..."
+        TENANT_BACKUP_OPTIONS="$COMMON_OPTIONS"
+        if [[ "$COMPRESS_TENANT" == "true" ]]; then
+            TENANT_BACKUP_OPTIONS+=" --compress"
+        fi
+        "$HANATOOL_PATH" "$USER_KEY" backup "${BACKUP_BASE_DIR}/tenant" $TENANT_BACKUP_OPTIONS
+        if [[ $? -ne 0 ]]; then
+            echo "❌ Error: Tenant backup failed."
+        fi
         ;;
     *)
         echo "   ❌ Error: Invalid BACKUP_TYPE '${BACKUP_TYPE}' in config. Use 'schema', 'tenant', or 'all'."
         ;;
 esac
 
-# NEW: Check if SYSTEMDB backup is enabled, regardless of BACKUP_TYPE (as long as it's not 'schema' only)
+# Check if SYSTEMDB backup is enabled, regardless of BACKUP_TYPE (as long as it's not 'schema' only)
 if [[ "$BACKUP_TYPE" == "tenant" || "$BACKUP_TYPE" == "all" ]]; then
     if [[ "$BACKUP_SYSTEMDB" == "true" ]]; then
         echo "--------------------------------------------------"
         if [[ -z "$SYSTEMDB_USER_KEY" ]]; then
             echo "   ❌ Error: BACKUP_SYSTEMDB is true, but SYSTEMDB_USER_KEY is not set in config."
         else
-            perform_database_backup "SYSTEMDB" "$SYSTEMDB_USER_KEY" "${BACKUP_BASE_DIR}/systemdb" "$COMPRESS_TENANT"
+            echo "⬇️  Starting SYSTEMDB backup..."
+            SYSTEMDB_BACKUP_OPTIONS="$COMMON_OPTIONS"
+            if [[ "$COMPRESS_TENANT" == "true" ]]; then # SYSTEMDB compression uses COMPRESS_TENANT setting
+                SYSTEMDB_BACKUP_OPTIONS+=" --compress"
+            fi
+            "$HANATOOL_PATH" "$SYSTEMDB_USER_KEY" backup "${BACKUP_BASE_DIR}/tenant" $SYSTEMDB_BACKUP_OPTIONS
+            if [[ $? -ne 0 ]]; then
+                echo "❌ Error: SYSTEMDB backup failed."
+            fi
         fi
     fi
 fi

cleaner.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 # Version: 1.1.0
+# Author: Tomi Eckert
 
 # Check if any arguments were provided
 if [ "$#" -eq 0 ]; then

hanatool.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
-# Version: 1.5.1
+# Version: 1.5.6
+# Author: Tomi Eckert
 # ==============================================================================
 # SAP HANA Schema and Tenant Management Tool (hanatool.sh)
 #
@@ -7,7 +8,22 @@
 # ==============================================================================
 
 # --- Default Settings ---
-HDBSQL_PATH="/usr/sap/hdbclient/hdbsql"
+# Define potential HDB client paths
+HDB_CLIENT_PATH_1="/usr/sap/hdbclient"
+HDB_CLIENT_PATH_2="/usr/sap/NDB/HDB00/exe"
+
+# Determine the correct HDB_CLIENT_PATH
+if [ -d "$HDB_CLIENT_PATH_1" ]; then
+    HDB_CLIENT_PATH="$HDB_CLIENT_PATH_1"
+elif [ -d "$HDB_CLIENT_PATH_2" ]; then
+    HDB_CLIENT_PATH="$HDB_CLIENT_PATH_2"
+else
+    echo "❌ Error: Neither '$HDB_CLIENT_PATH_1' nor '$HDB_CLIENT_PATH_2' found."
+    echo "Please install the SAP HANA client or adjust the paths in the script."
+    exit 1
+fi
+
+HDBSQL_PATH="${HDB_CLIENT_PATH}/hdbsql"
 COMPRESS=false
 THREADS=0 # 0 means auto-calculate later
 DRY_RUN=false
@@ -65,6 +81,28 @@ send_notification() {
     fi
 }
 
+# --- Function to get HANA tenant name ---
+get_hana_tenant_name() {
+    local user_key="$1"
+    local hdbsql_path="$2"
+    local dry_run="$3"
+    
+    local query="SELECT DATABASE_NAME FROM SYS.M_DATABASES;"
+    local tenant_name=""
+
+    if [[ "$dry_run" == "true" ]]; then
+        echo "[DRY RUN] Would execute hdbsql to get tenant name: \"$hdbsql_path\" -U \"$user_key\" \"$query\""
+        tenant_name="DRYRUN_TENANT"
+    else
+        tenant_name=$("$hdbsql_path" -U "$user_key" "$query" | tail -n +2 | head -n 1 | tr -d '[:space:]' | tr -d '"')
+        if [[ -z "$tenant_name" ]]; then
+            echo "❌ Error: Could not retrieve HANA tenant name using user key '${user_key}'."
+            exit 1
+        fi
+    fi
+    echo "$tenant_name"
+}
+
 # --- Argument Parsing ---
 POSITIONAL_ARGS=()
 while [[ $# -gt 0 ]]; do
@@ -148,28 +186,29 @@ case "$ACTION" in
         echo "   - Path:       ${TARGET_PATH}"
         echo "   - Compress:   ${COMPRESS}"
 
+        TENANT_NAME=$(get_hana_tenant_name "$USER_KEY" "$HDBSQL_PATH" "$DRY_RUN")
+        echo "   - Tenant Name: ${TENANT_NAME}"
+
         timestamp=$(date +%Y%m%d_%H%M%S)
-        backup_target_dir=""
+        backup_target_dir="$TARGET_PATH" # Initialize with TARGET_PATH
         backup_path_prefix=""
         
         if [[ "$COMPRESS" == "true" ]]; then
             if [[ "$DRY_RUN" == "true" ]]; then
-                backup_target_dir="/tmp/tenant_backup_DRYRUN_TEMP"
+                backup_target_dir="${TARGET_PATH}/${TENANT_NAME}_backup_DRYRUN_TEMP" # Use TARGET_PATH
             else
-                backup_target_dir=$(mktemp -d "/tmp/tenant_backup_${timestamp}_XXXXXXXX")
+                backup_target_dir=$(mktemp -d "${TARGET_PATH}/${TENANT_NAME}_backup_${timestamp}_XXXXXXXX") # Use TARGET_PATH
             fi
             echo "ℹ️  Using temporary backup directory: ${backup_target_dir}"
-        else
-            backup_target_dir="$TARGET_PATH"
         fi
         
-        if [[ "$DRY_RUN" == "true" && "$COMPRESS" == "false" ]]; then
+        if [[ "$DRY_RUN" == "true" ]]; then
              echo "[DRY RUN] Would create directory: mkdir -p \"$backup_target_dir\""
         else
             mkdir -p "$backup_target_dir"
         fi
 
-        backup_path_prefix="${backup_target_dir}/backup_${timestamp}"
+        backup_path_prefix="${backup_target_dir}/backup_${TENANT_NAME}_${timestamp}"
         
         QUERY="BACKUP DATA USING FILE ('${backup_path_prefix}')"
         
@@ -184,7 +223,7 @@ case "$ACTION" in
         if [[ "$EXIT_CODE" -eq 0 ]]; then
             echo "✅ Successfully initiated tenant backup with prefix '${backup_path_prefix}'."
             if [[ "$COMPRESS" == "true" ]]; then
-                ARCHIVE_FILE="${TARGET_PATH}/tenant_backup_${timestamp}.tar.gz"
+                ARCHIVE_FILE="${TARGET_PATH}/${TENANT_NAME}_backup_${timestamp}.tar.gz"
                 echo "🗜️  Compressing backup files to '${ARCHIVE_FILE}'..."
                 
                 TAR_EXIT_CODE=0
@@ -207,10 +246,10 @@ case "$ACTION" in
                     echo "❌ Error: Failed to create archive from '${backup_target_dir}'."
                 fi
             fi
-            send_notification "✅ Tenant backup for user key '${USER_KEY}' completed successfully."
+            send_notification "✅ HANA tenant '${TENANT_NAME}' backup completed successfully."
         else
             echo "❌ Error: Failed to initiate tenant backup (hdbsql exit code: ${EXIT_CODE})."
-            send_notification "❌ Tenant backup for user key '${USER_KEY}' FAILED."
+            send_notification "❌ HANA tenant '${TENANT_NAME}' backup FAILED."
             if [[ "$COMPRESS" == "true" && "$DRY_RUN" == "false" ]]; then rm -rf "$backup_target_dir"; fi
         fi
         ;;
@@ -247,7 +286,7 @@ case "$ACTION" in
             mkdir -p "$EXPORT_DIR"
         fi
         
-        QUERY="EXPORT \"${SCHEMA_NAME}\".\"*\" AS BINARY INTO '${EXPORT_DIR}' WITH REPLACE THREADS ${THREADS};"
+        QUERY="EXPORT \"${SCHEMA_NAME}\".\"*\" AS BINARY INTO '${EXPORT_DIR}' WITH REPLACE THREADS ${THREADS} NO DEPENDENCIES;"
         
         EXIT_CODE=0
         if [[ "$DRY_RUN" == "true" ]]; then

install.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+# Author: Tomi Eckert
 # --- Main Script ---
 
 # This script presents a menu of software packages, or installs them

keymanager.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
-# Version: 1.2.1
+# Version: 1.2.3
+# Author: Tomi Eckert
 
 # A script to interactively manage SAP HANA hdbuserstore keys, with testing.
 
@@ -12,7 +13,20 @@ COLOR_NC='\033[0m' # No Color
 
 # --- Configuration ---
 # Adjust these paths if your HANA client is installed elsewhere.
-HDB_CLIENT_PATH="/usr/sap/hdbclient"
+# Define potential HDB client paths
+HDB_CLIENT_PATH_1="/usr/sap/hdbclient"
+HDB_CLIENT_PATH_2="/usr/sap/NDB/HDB00/exe"
+
+# Check which path exists and set HDB_CLIENT_PATH accordingly
+if [ -d "$HDB_CLIENT_PATH_1" ]; then
+    HDB_CLIENT_PATH="$HDB_CLIENT_PATH_1"
+elif [ -d "$HDB_CLIENT_PATH_2" ]; then
+    HDB_CLIENT_PATH="$HDB_CLIENT_PATH_2"
+else
+    echo -e "${COLOR_RED}❌ Error: Neither '$HDB_CLIENT_PATH_1' nor '$HDB_CLIENT_PATH_2' found.${COLOR_NC}"
+    echo -e "${COLOR_RED}Please install the SAP HANA client or adjust the paths in the script.${COLOR_NC}"
+    exit 1
+fi
 HDB_USERSTORE_EXEC="${HDB_CLIENT_PATH}/hdbuserstore"
 HDB_SQL_EXEC="${HDB_CLIENT_PATH}/hdbsql"
 
@@ -65,7 +79,7 @@ create_new_key() {
 
     # Conditionally build the connection string
     if [[ "$is_systemdb" =~ ^[Yy]$ ]]; then
-        CONNECTION_STRING="${hdb_host}:3${hdb_instance}15"
+        CONNECTION_STRING="${hdb_host}:3${hdb_instance}13"
         echo -e "${COLOR_YELLOW}💡 Connecting to SYSTEMDB. Tenant name will be omitted from the connection string.${COLOR_NC}"
     else
         read -p "Enter the Tenant DB [NDB]: " hdb_tenant

monitor/monitor.conf

@@ -1,4 +1,5 @@
 # Configuration for SAP HANA Monitoring Script
+# Author: Tomi Eckert
 
 # --- Company Information ---
 # Used to identify which company the alert is for.

monitor/monitor.hook.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+# Author: Tomi Eckert
 # This script helps to configure monitor.conf
 
 # Source the monitor.conf to get current values

monitor/monitor.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 # Version: 1.3.1
+# Author: Tomi Eckert
 # =============================================================================
 # SAP HANA Monitoring Script
 #

packages.conf

@@ -1,4 +1,5 @@
 #!/bin/bash
+# Author: Tomi Eckert
 #
 # This file contains the configuration for the script downloader.
 # The `SCRIPT_PACKAGES` associative array maps a short package name
@@ -10,8 +11,8 @@ declare -A SCRIPT_PACKAGES
 
 # Format: short_name="Display Name|Version|Description|URL1 URL2..."
 SCRIPT_PACKAGES["aurora"]="Aurora Suite|2.1.0|A collection of scripts for managing Aurora database instances.|https://git.technopunk.space/tomi/Scripts/raw/branch/main/aurora/aurora.sh https://git.technopunk.space/tomi/Scripts/raw/branch/main/aurora/aurora.conf"
-SCRIPT_PACKAGES["backup"]="Backup Suite|1.0.5|A comprehensive script for backing up system files and databases.|https://git.technopunk.space/tomi/Scripts/raw/branch/main/backup/backup.sh https://git.technopunk.space/tomi/Scripts/raw/branch/main/backup/backup.conf"
+SCRIPT_PACKAGES["backup"]="Backup Suite|1.0.8|A comprehensive script for backing up system files and databases.|https://git.technopunk.space/tomi/Scripts/raw/branch/main/backup/backup.sh https://git.technopunk.space/tomi/Scripts/raw/branch/main/backup/backup.conf"
 SCRIPT_PACKAGES["monitor"]="Monitor Suite|1.3.1|Scripts for monitoring system health and performance metrics.|https://git.technopunk.space/tomi/Scripts/raw/branch/main/monitor/monitor.sh https://git.technopunk.space/tomi/Scripts/raw/branch/main/monitor/monitor.conf|https://git.technopunk.space/tomi/Scripts/raw/branch/main/monitor/monitor.hook.sh"
-SCRIPT_PACKAGES["keymanager"]="Key Manager|1.2.1|A utility for managing HDB user keys for SAP HANA.|https://git.technopunk.space/tomi/Scripts/raw/branch/main/keymanager.sh"
+SCRIPT_PACKAGES["keymanager"]="Key Manager|1.2.3|A utility for managing HDB user keys for SAP HANA.|https://git.technopunk.space/tomi/Scripts/raw/branch/main/keymanager.sh"
 SCRIPT_PACKAGES["cleaner"]="File Cleaner|1.1.0|A simple script to clean up temporary files and logs.|https://git.technopunk.space/tomi/Scripts/raw/branch/main/cleaner.sh"
-SCRIPT_PACKAGES["hanatool"]="HANA Tool|1.5.1|A command-line tool for various SAP HANA administration tasks.|https://git.technopunk.space/tomi/Scripts/raw/branch/main/hanatool.sh"
+SCRIPT_PACKAGES["hanatool"]="HANA Tool|1.5.6|A command-line tool for various SAP HANA administration tasks.|https://git.technopunk.space/tomi/Scripts/raw/branch/main/hanatool.sh"