fix(acfs): canonicalize offline pack resume paths

Author: Dicklesworthstone

install.sh

@@ -1415,6 +1415,55 @@ acfs_require_ref_arg_value() {
     esac
 }
 
+acfs_resolve_offline_pack_dir() {
+    local flag="$1"
+    local value="${2:-}"
+    local candidate=""
+    local resolved=""
+
+    if [[ -z "$value" || "$value" == -* ]]; then
+        log_fatal "$flag requires a directory"
+    fi
+    if [[ "$value" == *$'\n'* || "$value" == *$'\r'* ]]; then
+        log_fatal "$flag requires a single-line directory"
+    fi
+
+    case "$value" in
+        /*) candidate="$value" ;;
+        *) candidate="$PWD/$value" ;;
+    esac
+    candidate="${candidate%/}"
+
+    if [[ -z "$candidate" || ! -d "$candidate" ]]; then
+        log_fatal "$flag must point to an existing extracted offline pack directory (got: $value)"
+    fi
+
+    resolved="$(cd "$candidate" && pwd -P)" || {
+        log_fatal "$flag could not resolve directory: $value"
+    }
+
+    if [[ ! -r "$resolved/manifest.json" && ! -r "$resolved/acfs-offline-pack/manifest.json" ]]; then
+        log_fatal "$flag must point to acfs-offline-pack/ or its parent directory with manifest.json"
+    fi
+
+    printf '%s\n' "$resolved"
+}
+
+acfs_normalize_offline_pack_configuration() {
+    if [[ -z "${ACFS_OFFLINE_PACK:-}" ]]; then
+        return 0
+    fi
+
+    ACFS_OFFLINE_PACK="$(acfs_resolve_offline_pack_dir "ACFS_OFFLINE_PACK" "$ACFS_OFFLINE_PACK")"
+    if [[ -z "${ACFS_OFFLINE_NETWORK_MODE:-}" ]]; then
+        ACFS_OFFLINE_NETWORK_MODE=offline
+    fi
+    if [[ "${ACFS_OFFLINE_NETWORK_MODE:-}" == "offline" && -z "${ACFS_OFFLINE_PACK_REQUIRED:-}" ]]; then
+        ACFS_OFFLINE_PACK_REQUIRED=true
+    fi
+    export ACFS_OFFLINE_PACK ACFS_OFFLINE_NETWORK_MODE ACFS_OFFLINE_PACK_REQUIRED
+}
+
 parse_args() {
     while [[ $# -gt 0 ]]; do
         case $1 in
@@ -1530,9 +1579,6 @@ parse_args() {
                     fi
                     shift
                 fi
-                if [[ "$ACFS_OFFLINE_PACK" == *$'\n'* || "$ACFS_OFFLINE_PACK" == *$'\r'* ]]; then
-                    log_fatal "--offline-pack requires a single-line directory"
-                fi
                 ACFS_OFFLINE_NETWORK_MODE=offline
                 ACFS_OFFLINE_PACK_REQUIRED=true
                 export ACFS_OFFLINE_PACK ACFS_OFFLINE_NETWORK_MODE ACFS_OFFLINE_PACK_REQUIRED
@@ -7883,6 +7929,8 @@ main() {
         exit 0
     fi
 
+    acfs_normalize_offline_pack_configuration
+
     if [[ -z "${SCRIPT_DIR:-}" ]]; then
         # Resolve ACFS_REF to a specific commit SHA early to prevent mixed-ref installs.
         # Without this, we could download a tarball for one commit and later fetch commit metadata

tests/unit/test_resume_hint.sh

@@ -90,6 +90,14 @@ extract_ref_arg_value_helper() {
     sed -n '/^acfs_require_ref_arg_value()/,/^}$/p' "$REPO_ROOT/install.sh"
 }
 
+extract_offline_pack_dir_helper() {
+    sed -n '/^acfs_resolve_offline_pack_dir()/,/^}$/p' "$REPO_ROOT/install.sh"
+}
+
+extract_offline_pack_normalizer() {
+    sed -n '/^acfs_normalize_offline_pack_configuration()/,/^}$/p' "$REPO_ROOT/install.sh"
+}
+
 # Actually, let's just define our test environment and source install.sh functions
 setup_test_env() {
     # Reset all variables to defaults
@@ -110,6 +118,9 @@ setup_test_env() {
     DRY_RUN=false
     PRINT_MODE=false
     AUTO_FIX_MODE="prompt"
+    ACFS_OFFLINE_PACK=""
+    ACFS_OFFLINE_NETWORK_MODE=""
+    ACFS_OFFLINE_PACK_REQUIRED=""
 }
 
 setup_parse_args_env() {
@@ -143,6 +154,10 @@ eval "$(extract_normalize_read_only_modes_function)"
 # shellcheck disable=SC1090
 eval "$(extract_ref_arg_value_helper)"
 # shellcheck disable=SC1090
+eval "$(extract_offline_pack_dir_helper)"
+# shellcheck disable=SC1090
+eval "$(extract_offline_pack_normalizer)"
+# shellcheck disable=SC1090
 eval "$(extract_parse_args_function)"
 
 STATE_SET_RESUME_HINT_CALLS=0
@@ -375,6 +390,52 @@ test_custom_checksums_ref_resume_hint() {
     return 0
 }
 
+test_offline_pack_relative_path_is_normalized_for_resume_hint() {
+    setup_test_env
+
+    local temp_root=""
+    local old_pwd=""
+    local result=""
+    local expected_pack=""
+    local expected_pack_q=""
+
+    temp_root="$(mktemp -d "${TMPDIR:-/tmp}/acfs-resume-pack.XXXXXX")" || return 1
+    mkdir -p "$temp_root/work/pack with spaces/acfs-offline-pack" || return 1
+    printf '{}\n' > "$temp_root/work/pack with spaces/acfs-offline-pack/manifest.json" || return 1
+
+    old_pwd="$PWD"
+    cd "$temp_root/work" || return 1
+    ACFS_OFFLINE_PACK="pack with spaces"
+    acfs_normalize_offline_pack_configuration || {
+        cd "$old_pwd" || true
+        return 1
+    }
+    cd "$old_pwd" || return 1
+
+    expected_pack="$temp_root/work/pack with spaces"
+    if [[ "$ACFS_OFFLINE_PACK" != "$expected_pack" ]]; then
+        log "  Expected ACFS_OFFLINE_PACK=$expected_pack, got: $ACFS_OFFLINE_PACK"
+        return 1
+    fi
+    if [[ "$ACFS_OFFLINE_NETWORK_MODE" != "offline" ]]; then
+        log "  Expected ACFS_OFFLINE_NETWORK_MODE=offline, got: $ACFS_OFFLINE_NETWORK_MODE"
+        return 1
+    fi
+    if [[ "$ACFS_OFFLINE_PACK_REQUIRED" != "true" ]]; then
+        log "  Expected ACFS_OFFLINE_PACK_REQUIRED=true, got: $ACFS_OFFLINE_PACK_REQUIRED"
+        return 1
+    fi
+
+    result="$(generate_resume_hint "" "")"
+    printf -v expected_pack_q '%q' "$expected_pack"
+    if [[ "$result" != *"--offline-pack $expected_pack_q"* ]]; then
+        log "  Expected absolute --offline-pack in resume hint, got: $result"
+        return 1
+    fi
+
+    return 0
+}
+
 # Test: Safe mode
 test_safe_mode() {
     setup_test_env
@@ -716,6 +777,7 @@ main() {
     run_test test_custom_ref_shell_escaped
     run_test test_checksums_ref_survives_ref_parse_order
     run_test test_custom_checksums_ref_resume_hint
+    run_test test_offline_pack_relative_path_is_normalized_for_resume_hint
     run_test test_safe_mode
     run_test test_skip_flags
     run_test test_all_skip_flags