RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2025-01-04 20:19:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

kpatch, kpatch-build: further shell code cleanup

Browse Source 
- Replace echo $(cmd) with just cmd.
- Replace $@ inside quotes with $*.
- Always die if cd fails.
- Ensure rm -rf "$TEMPDIR"/* never expands to rm -rf /*.

Found by shellcheck.
This commit is contained in:
Simon Ruderich 2017-09-21 20:47:59 +02:00
parent 08fa04bb0d
commit 60e5125cb0
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kpatch-build/kpatch-build
View File

@ -444,7 +444,7 @@ fi
# ensure cachedir and tempdir are setup properly and cleaned
mkdir -p "$TEMPDIR" || die "Couldn't create $TEMPDIR"
rm -rf "$TEMPDIR"/*
rm -rf "${TEMPDIR:?}"/*
rm -f "$LOGFILE"
if [[ -n "$USERSRCDIR" ]]; then
@ -562,7 +562,7 @@ else
clean_cache
cd "$TEMPDIR"
cd "$TEMPDIR" || die
echo "Downloading and unpacking the kernel source for $ARCHVERSION"
# Download source deb pkg
(dget -u "$url/${pkgname}/${dscname}" 2>&1) >> "$LOGFILE" || die "dget: Could not fetch/unpack $url/${pkgname}/${dscname}"
@ -688,7 +688,7 @@ if [[ -z "$MODNAME" ]] ; then
MODNAME="$(module_name_string "$MODNAME")"
fi
FILES="$(cat "$TEMPDIR/changed_objs")"
cd "$TEMPDIR"
cd "$TEMPDIR" || die
mkdir output
declare -a objnames
CHANGED=0
@ -703,14 +703,14 @@ for i in $FILES; do
[[ "$i" = usr/initramfs_data.o ]] && continue
mkdir -p "output/$(dirname "$i")"
cd "$SRCDIR"
cd "$SRCDIR" || die
find_kobj "$i"
if [[ "$KOBJFILE" = vmlinux ]]; then
KOBJFILE="$VMLINUX"
else
KOBJFILE="$TEMPDIR/module/$KOBJFILE"
fi
cd "$TEMPDIR"
cd "$TEMPDIR" || die
if [[ -e "orig/$i" ]]; then
# create-diff-object orig.o patched.o kernel-object output.o Module.symvers patch-mod-name
"$TOOLSDIR"/create-diff-object "orig/$i" "patched/$i" "$KOBJFILE" \
@ -750,7 +750,7 @@ if "$KPATCH_MODULE"; then
fi
echo "Building patch module: $MODNAME.ko"
cd "$SRCDIR"
cd "$SRCDIR" || die
make prepare >> "$LOGFILE" 2>&1 || die
if [[ ! -z "$UBUNTU_KERNEL" ]]; then
@ -760,7 +760,7 @@ if [[ ! -z "$UBUNTU_KERNEL" ]]; then
echo "#define UTS_UBUNTU_RELEASE_ABI "$UBUNTU_ABI"" >> "$SRCDIR"/include/generated/utsrelease.h
fi
cd "$TEMPDIR/output"
cd "$TEMPDIR/output" || die
ld -r $KPATCH_LDFLAGS -o ../patch/tmp_output.o $(find . -name "*.o") >> "$LOGFILE" 2>&1 || die
if "$KPATCH_MODULE"; then
@ -774,7 +774,7 @@ else
cp "$TEMPDIR"/patch/tmp_output.o "$TEMPDIR"/patch/output.o || die
fi
cd "$TEMPDIR/patch"
cd "$TEMPDIR/patch" || die
KPATCH_BUILD="$SRCDIR" KPATCH_NAME="$MODNAME" \
KBUILD_EXTRA_SYMBOLS="$KBUILD_EXTRA_SYMBOLS" \

6
kpatch/kpatch
View File

@ -62,7 +62,7 @@ usage () {
}
warn() {
echo "kpatch: $@" >&2
echo "kpatch: $*" >&2
}
die() {
@ -129,7 +129,7 @@ core_loaded () {
}
get_module_name () {
echo "$(readelf -p .gnu.linkonce.this_module "$1" | grep '\[.*\]' | awk '{print $3}')"
readelf -p .gnu.linkonce.this_module "$1" | grep '\[.*\]' | awk '{print $3}'
}
verify_module_checksum () {
@ -334,7 +334,7 @@ case "$1" in
echo "Loaded patch modules:"
for module in "$SYSFS"/*; do
if [[ -e "$module" ]] && [[ "$(cat "$module/enabled")" -eq 1 ]]; then
echo "$(basename "$module")"
basename "$module"
fi
done
echo ""