Skip to content

Commit fa96c92

Browse files
committed
[rbuilds.sh] Fix first positional parameter parsing as provided Dockerfile to build EIF root file system.
1 parent c80038c commit fa96c92

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

rbuilds/rbuilds.sh

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1403,6 +1403,25 @@ if [[ ${args["--debug"]} -eq 1 || ${args["--verbose"]} -eq 1 || ${args["-v"]} -e
14031403
printf " '%s'\n" "${posargs[@]}"
14041404
fi
14051405

1406+
# Use of positional parameters
1407+
for key in "${!posargs[@]}"; do
1408+
if [[ ${args["--debug"]} -eq 1 || ${args["--verbose"]} -eq 1 || ${args["-v"]} -eq 1 ]]; then
1409+
echo -e "\nPosArg:\n$key = ${posargs[$key]}\n"
1410+
fi
1411+
1412+
case "${posargs[$key]}" in
1413+
*.dockerfile) # Build EIF image from Docker container extracted rootfs, created from Docker image, formed by dockerfile scenario
1414+
dockerfile=$(echo -E "${posargs[$key]}" | pcregrep --color -Mio -e "^(\.\/)?([^\s]*?\/)*([^\s]*?)(\.dockerfile)$");
1415+
if [[ -z ${dockerfile} ]]; then
1416+
dockerfile=$(echo -E "${dockerfile:-"./pipeline-al2023.dockerfile"}" | pcregrep --color -Mio -e "^(\.\/)?([^\s]*?\/)*([^\s]*?)(\.dockerfile)$");
1417+
fi
1418+
;;
1419+
*)
1420+
echo -e "Positional argument/parameter ${posargs[$key]} isn't supported\n"
1421+
;;
1422+
esac
1423+
done
1424+
14061425
# Override default variables values, provide dockerfile, execute commands
14071426
for key in "${args_appearance_ordered_array_index_mask[@]}"; do
14081427
if [[ ${args["--debug"]} -eq 1 || ${args["--verbose"]} -eq 1 || ${args["-v"]} -eq 1 ]]; then
@@ -1539,25 +1558,6 @@ for key in "${args_appearance_ordered_array_index_mask[@]}"; do
15391558
esac
15401559
done
15411560

1542-
# Use of positional parameters
1543-
for key in "${!posargs[@]}"; do
1544-
if [[ ${args["--debug"]} -eq 1 || ${args["--verbose"]} -eq 1 || ${args["-v"]} -eq 1 ]]; then
1545-
echo -e "\nPosArg:\n$key = ${posargs[$key]}\n"
1546-
fi
1547-
1548-
case "${posargs[$key]}" in
1549-
*.dockerfile) # Build EIF image from Docker container extracted rootfs, created from Docker image, formed by dockerfile scenario
1550-
dockerfile=$(echo -E "${posargs[$key]}" | pcregrep --color -Mio -e "^(\.\/)?([^\s]*?\/)*([^\s]*?)(\.dockerfile)$");
1551-
if [[ -z ${dockerfile} ]]; then
1552-
dockerfile=$(echo -E "${dockerfile:-"./pipeline-al2023.dockerfile"}" | pcregrep --color -Mio -e "^(\.\/)?([^\s]*?\/)*([^\s]*?)(\.dockerfile)$");
1553-
fi
1554-
;;
1555-
*)
1556-
echo -e "Positional argument/parameter ${posargs[$key]} isn't supported\n"
1557-
;;
1558-
esac
1559-
done
1560-
15611561
if [[ ${should_exit} -ne 0 ]]; then
15621562
exit 0
15631563
fi

0 commit comments

Comments
 (0)