RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 09:58:11 +00:00
Code Issues Activity Actions

Meta: Fix shellcheck warnings in various scripts

Browse source 
Warnings fixed:
 * SC2086: Double quote to prevent globbing and word splitting.
 * SC2006: Use $(...) notation instead of legacy backticked `...`
 * SC2039: In POSIX sh, echo flags are undefined
 * SC2209: Use var=$(command) to assign output (or quote to assign string)
 * SC2164: Use 'cd ... || exit' or 'cd ... || return' in case cd fails
 * SC2166: Prefer [ p ] && [ q ] as [ p -a q ] is not well defined.
 * SC2034: i appears unused. Verify use (or export if used externally)
 * SC2046: Quote this to prevent word splitting.
 * SC2236: Use -z instead of ! -n.

There are still a lot of warnings in Kernel/run about:
 - SC2086: Double quote to prevent globbing and word splitting.

However, splitting on space is intentional in this case, and not trivial to
change. Therefore ignore the warning for now - but we should fix this in
the future.
This commit is contained in:
Shannon Booth 2020-02-10 19:09:08 +13:00 • committed by Andreas Kling
parent e9be8669d2
commit fe668db999
6 changed files with 28 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Kernel/build-image-qemu.sh
View file

@ -15,20 +15,20 @@ if [ "$(uname -s)" = "Darwin" ]; then
export PATH="/usr/local/opt/e2fsprogs/sbin:$PATH"
fi
echo "setting up disk image..."
qemu-img create _disk_image "${DISK_SIZE:-600}"m || die "couldn't create disk image"
chown "$SUDO_UID":"$SUDO_GID" _disk_image || die "couldn't adjust permissions on disk image"
qemu-img create _disk_image "${DISK_SIZE:-600}"m || die "could not create disk image"
chown "$SUDO_UID":"$SUDO_GID" _disk_image || die "could not adjust permissions on disk image"
echo "done"
printf "creating new filesystem... "
if [ "$(uname -s)" = "OpenBSD" ]; then
VND=`vnconfig _disk_image`
(echo "e 0"; echo 83; echo n; echo 0; echo "*"; echo "quit") | fdisk -e $VND
mkfs.ext2 -I 128 -F /dev/${VND}i || die "couldn't create filesystem"
VND=$(vnconfig _disk_image)
(echo "e 0"; echo 83; echo n; echo 0; echo "*"; echo "quit") | fdisk -e "$VND"
mkfs.ext2 -I 128 -F "/dev/${VND}i" || die "could not create filesystem"
else
if [ -x /sbin/mke2fs ]; then
/sbin/mke2fs -q -I 128 _disk_image || die "couldn't create filesystem"
/sbin/mke2fs -q -I 128 _disk_image || die "could not create filesystem"
else
mke2fs -q -I 128 _disk_image || die "couldn't create filesystem"
mke2fs -q -I 128 _disk_image || die "could not create filesystem"
fi
fi
echo "done"
@ -36,11 +36,11 @@ echo "done"
printf "mounting filesystem... "
mkdir -p mnt
if [ "$(uname -s)" = "Darwin" ]; then
fuse-ext2 _disk_image mnt -o rw+,allow_other,uid=501,gid=20 || die "couldn't mount filesystem"
fuse-ext2 _disk_image mnt -o rw+,allow_other,uid=501,gid=20 || die "could not mount filesystem"
elif [ "$(uname -s)" = "OpenBSD" ]; then
mount -t ext2fs /dev/${VND}i mnt/ || die "couldn't mount filesystem"
mount -t ext2fs "/dev/${VND}i" mnt/ || die "could not mount filesystem"
else
mount _disk_image mnt/ || die "couldn't mount filesystem"
mount _disk_image mnt/ || die "could not mount filesystem"
fi
echo "done"
@ -50,7 +50,7 @@ cleanup() {
umount mnt || ( sleep 1 && sync && umount mnt )
rm -rf mnt
if [ "$(uname -s)" = "OpenBSD" ]; then
vnconfig -u $VND
vnconfig -u "$VND"
fi
echo "done"
fi