Skip to content

Commit 129fb4a

Browse files
committed
Merge pull request #551 from libin2015/reduce-dependency-on-bash-version
kpatch-build: reduce dependency on bash version >4.0
2 parents f152d00 + 273ea9a commit 129fb4a

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

kpatch-build/kpatch-build

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ echo "Extracting new and modified ELF sections"
508508
FILES="$(cat "$TEMPDIR/changed_objs")"
509509
cd "$TEMPDIR"
510510
mkdir output
511-
declare -A objnames
511+
declare -a objnames
512512
CHANGED=0
513513
ERROR=0
514514
for i in $FILES; do
@@ -539,11 +539,11 @@ for i in $FILES; do
539539
if [[ $rc -eq 0 ]]; then
540540
[[ -n $ERROR_IF_DIFF ]] && die $ERROR_IF_DIFF
541541
CHANGED=1
542-
objnames[$KOBJFILE]=1
542+
objnames[${#objnames[@]}]=$KOBJFILE
543543
fi
544544
else
545545
cp -f "patched/$i" "output/$i"
546-
objnames[$KOBJFILE]=1
546+
objnames[${#objnames[@]}]=$KOBJFILE
547547
fi
548548
done
549549

@@ -556,7 +556,10 @@ if [[ $CHANGED -eq 0 ]]; then
556556
fi
557557

558558
echo -n "Patched objects:"
559-
for i in "${!objnames[@]}"; do echo -n " $(basename $i)"; done
559+
for i in $(echo "${objnames[@]}" | tr ' ' '\n' | sort -u | tr '\n' ' ')
560+
do
561+
echo -n " $(basename $i)"
562+
done
560563
echo
561564

562565
export KCFLAGS="-I$DATADIR/patch"

0 commit comments

Comments
 (0)