mirror of
https://github.com/SCST-project/scst.git
synced 2026-08-31 21:29:08 +00:00
scripts: Fix helper edge cases
Propagate patch and module-list failures, normalize the script directory, and expand the actual Mercurial subrepository name when matching paths. Keep the existing no-optional-patches behavior unchanged.
This commit is contained in:
@@ -28,7 +28,7 @@ script_dir="$(dirname "$0")"
|
||||
if [ "${script_dir#/}" = "${script_dir}" ]; then
|
||||
script_dir="$PWD/$script_dir"
|
||||
fi
|
||||
scriptdir="${scriptdir%/.}"
|
||||
script_dir="${script_dir%/.}"
|
||||
scst_dir="$(dirname "${script_dir}")"
|
||||
|
||||
# shellcheck source=./kernel-functions
|
||||
@@ -51,5 +51,5 @@ cd "${target}" || exit $?
|
||||
grep -v /in-tree/ |
|
||||
while read -r p; do
|
||||
echo "==== $p"
|
||||
patch -p1 <"${scst_dir}/$p"
|
||||
patch -p1 <"${scst_dir}/$p" || exit $?
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user