diff --git a/apt-layer.sh b/apt-layer.sh index 4a24666..f5bb62a 100644 --- a/apt-layer.sh +++ b/apt-layer.sh @@ -6,7 +6,7 @@ # DO NOT modify this file directly as it will be overwritten # # # # apt-layer Tool # -# Generated on: 2025-07-15 17:57:47 # +# Generated on: 2025-07-15 18:39:00 # # # ################################################################################################################ @@ -7571,12 +7571,32 @@ install_daemon() { log_info "Installing apt-ostree daemon..." "apt-layer" # Check if Python daemon directory exists - local daemon_dir="$(dirname "$0")/../apt-ostree.py/python" - if [[ ! -d "$daemon_dir" ]]; then - log_error "Daemon source not found: $daemon_dir" "apt-layer" + # Try multiple possible paths for daemon source + local daemon_dir="" + local possible_paths=( + "$(dirname "$0")/../apt-ostree.py/python" + "$(dirname "$0")/../../src/apt-ostree.py/python" + "./src/apt-ostree.py/python" + "../src/apt-ostree.py/python" + ) + + for path in "${possible_paths[@]}"; do + if [[ -d "$path" ]]; then + daemon_dir="$path" + break + fi + done + + if [[ -z "$daemon_dir" ]]; then + log_error "Daemon source not found. Tried paths:" "apt-layer" + for path in "${possible_paths[@]}"; do + log_error " - $path" "apt-layer" + done return 1 fi + log_info "Found daemon source at: $daemon_dir" "apt-layer" + # Run the daemon install script if [[ -f "$daemon_dir/install.py" ]]; then if python3 "$daemon_dir/install.py"; then diff --git a/src/apt-layer/scriptlets/20-daemon-integration.sh b/src/apt-layer/scriptlets/20-daemon-integration.sh index 856fb42..5e83c0e 100644 --- a/src/apt-layer/scriptlets/20-daemon-integration.sh +++ b/src/apt-layer/scriptlets/20-daemon-integration.sh @@ -458,12 +458,32 @@ install_daemon() { log_info "Installing apt-ostree daemon..." "apt-layer" # Check if Python daemon directory exists - local daemon_dir="$(dirname "$0")/../apt-ostree.py/python" - if [[ ! -d "$daemon_dir" ]]; then - log_error "Daemon source not found: $daemon_dir" "apt-layer" + # Try multiple possible paths for daemon source + local daemon_dir="" + local possible_paths=( + "$(dirname "$0")/../apt-ostree.py/python" + "$(dirname "$0")/../../src/apt-ostree.py/python" + "./src/apt-ostree.py/python" + "../src/apt-ostree.py/python" + ) + + for path in "${possible_paths[@]}"; do + if [[ -d "$path" ]]; then + daemon_dir="$path" + break + fi + done + + if [[ -z "$daemon_dir" ]]; then + log_error "Daemon source not found. Tried paths:" "apt-layer" + for path in "${possible_paths[@]}"; do + log_error " - $path" "apt-layer" + done return 1 fi + log_info "Found daemon source at: $daemon_dir" "apt-layer" + # Run the daemon install script if [[ -f "$daemon_dir/install.py" ]]; then if python3 "$daemon_dir/install.py"; then