Skip to content

Commit 33d9e62

Browse files
Copilotmagerstam
andauthored
fix(scripts): improve cleanup path canonicalization diagnostics
Agent-Logs-Url: https://github.com/open-edge-platform/image-composer-tool/sessions/41236530-0008-43cf-bb4d-a72a9887eed1 Co-authored-by: magerstam <77846379+magerstam@users.noreply.github.com>
1 parent 8694053 commit 33d9e62

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

scripts/cleanup_workspace

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,22 @@ set -euo pipefail
77

88
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
99
REPO_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
10-
DEFAULT_WORKSPACE_DIR="$REPO_ROOT/workspace"
11-
WORKSPACE_DIR="$DEFAULT_WORKSPACE_DIR"
1210
MAX_UMOUNT_PASSES=5
1311
FORCE_DELETE=false
1412

13+
if ! command -v realpath >/dev/null 2>&1; then
14+
echo "realpath command is required but not found" >&2
15+
exit 1
16+
fi
17+
18+
DEFAULT_WORKSPACE_DIR_INPUT="$REPO_ROOT/workspace"
19+
if ! DEFAULT_WORKSPACE_DIR="$(realpath -m "$DEFAULT_WORKSPACE_DIR_INPUT" 2>/dev/null)"; then
20+
echo "Failed to resolve default workspace directory path: $DEFAULT_WORKSPACE_DIR_INPUT" >&2
21+
exit 1
22+
fi
23+
readonly DEFAULT_WORKSPACE_DIR
24+
WORKSPACE_DIR="$DEFAULT_WORKSPACE_DIR"
25+
1526
run_privileged() {
1627
if [[ "$EUID" -eq 0 ]]; then
1728
"$@"
@@ -94,19 +105,9 @@ while [[ $# -gt 0 ]]; do
94105
esac
95106
done
96107

97-
if ! command -v realpath >/dev/null 2>&1; then
98-
echo "realpath command is required but not found" >&2
99-
exit 1
100-
fi
101-
102-
if ! DEFAULT_WORKSPACE_DIR="$(realpath -m "$DEFAULT_WORKSPACE_DIR" 2>/dev/null)"; then
103-
echo "Failed to resolve default workspace directory path: $DEFAULT_WORKSPACE_DIR" >&2
104-
exit 1
105-
fi
106-
readonly DEFAULT_WORKSPACE_DIR
107-
108-
if ! WORKSPACE_DIR="$(realpath -m "$WORKSPACE_DIR" 2>/dev/null)"; then
109-
echo "Failed to canonicalize workspace directory path (check permissions or path validity): $WORKSPACE_DIR" >&2
108+
WORKSPACE_DIR_INPUT="$WORKSPACE_DIR"
109+
if ! WORKSPACE_DIR="$(realpath -m "$WORKSPACE_DIR_INPUT" 2>/dev/null)"; then
110+
echo "Failed to canonicalize workspace directory path (check permissions or path validity): $WORKSPACE_DIR_INPUT" >&2
110111
exit 1
111112
fi
112113

0 commit comments

Comments
 (0)