Skip to content

Commit 236a806

Browse files
committed
no-mistakes(lint): Fix ShellCheck-safe Pi runtime discovery loops
1 parent f2f1ebb commit 236a806

3 files changed

Lines changed: 27 additions & 27 deletions

File tree

tests/fm-pi-direct-continuity-types.test.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,7 @@ pi_package=${FM_PI_PACKAGE_DIR:-}
88
tsc_bin=
99
selected_node_dir=
1010

11-
for node_bin in $(
12-
{
13-
type -a -p node 2>/dev/null
14-
for node_bin in /opt/homebrew/opt/node/bin/node /usr/local/opt/node/bin/node; do
15-
[ -x "$node_bin" ] && printf '%s\n' "$node_bin"
16-
done
17-
} | awk '!seen[$0]++'
18-
); do
11+
while IFS= read -r node_bin; do
1912
node_dir=$(dirname "$node_bin")
2013
[ -n "$selected_node_dir" ] || selected_node_dir=$node_dir
2114
if [ -z "$pi_package" ] && [ -x "$node_dir/npm" ]; then
@@ -24,7 +17,14 @@ for node_bin in $(
2417
pi_package=$candidate
2518
fi
2619
fi
27-
done
20+
done < <(
21+
{
22+
type -a -p node 2>/dev/null
23+
for candidate_node in /opt/homebrew/opt/node/bin/node /usr/local/opt/node/bin/node; do
24+
[ -x "$candidate_node" ] && printf '%s\n' "$candidate_node"
25+
done
26+
} | awk '!seen[$0]++'
27+
)
2828

2929
for candidate in \
3030
"$(command -v tsc 2>/dev/null || true)" \

tests/fm-pi-direct-continuity.test.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,7 @@ ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
77
selected_node=
88
pi_package=${FM_PI_PACKAGE_DIR:-}
99

10-
for node_bin in $(
11-
{
12-
type -a -p node 2>/dev/null
13-
for node_bin in /opt/homebrew/opt/node/bin/node /usr/local/opt/node/bin/node; do
14-
[ -x "$node_bin" ] && printf '%s\n' "$node_bin"
15-
done
16-
} | awk '!seen[$0]++'
17-
); do
10+
while IFS= read -r node_bin; do
1811
[ -n "$node_bin" ] || continue
1912
node_dir=$(dirname "$node_bin")
2013
if [ -z "$selected_node" ] && [ "$("$node_bin" -p 'process.features?.typescript ? "yes" : "no"' 2>/dev/null)" = yes ]; then
@@ -26,7 +19,14 @@ for node_bin in $(
2619
pi_package=$candidate
2720
fi
2821
fi
29-
done
22+
done < <(
23+
{
24+
type -a -p node 2>/dev/null
25+
for candidate_node in /opt/homebrew/opt/node/bin/node /usr/local/opt/node/bin/node; do
26+
[ -x "$candidate_node" ] && printf '%s\n' "$candidate_node"
27+
done
28+
} | awk '!seen[$0]++'
29+
)
3030

3131
[ -n "$selected_node" ] || { echo "not ok - no available Node runtime supports TypeScript import" >&2; exit 1; }
3232
[ -n "$pi_package" ] && [ -f "$pi_package/package.json" ] || { echo "not ok - installed Pi package not found" >&2; exit 1; }

tests/fm-pi-retry-continuity.test.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,7 @@ ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
77
selected_node=
88
pi_package=${FM_PI_PACKAGE_DIR:-}
99

10-
for node_bin in $(
11-
{
12-
type -a -p node 2>/dev/null
13-
for node_bin in /opt/homebrew/opt/node/bin/node /usr/local/opt/node/bin/node; do
14-
[ -x "$node_bin" ] && printf '%s\n' "$node_bin"
15-
done
16-
} | awk '!seen[$0]++'
17-
); do
10+
while IFS= read -r node_bin; do
1811
node_dir=$(dirname "$node_bin")
1912
if [ -z "$selected_node" ] && [ "$("$node_bin" -p 'process.features?.typescript ? "yes" : "no"' 2>/dev/null)" = yes ]; then
2013
selected_node=$node_dir
@@ -25,7 +18,14 @@ for node_bin in $(
2518
pi_package=$candidate
2619
fi
2720
fi
28-
done
21+
done < <(
22+
{
23+
type -a -p node 2>/dev/null
24+
for candidate_node in /opt/homebrew/opt/node/bin/node /usr/local/opt/node/bin/node; do
25+
[ -x "$candidate_node" ] && printf '%s\n' "$candidate_node"
26+
done
27+
} | awk '!seen[$0]++'
28+
)
2929

3030
[ -n "$selected_node" ] || { echo "not ok - no available Node runtime supports TypeScript import" >&2; exit 1; }
3131
[ -n "$pi_package" ] && [ -f "$pi_package/package.json" ] || { echo "not ok - installed Pi package not found" >&2; exit 1; }

0 commit comments

Comments
 (0)