Skip to content

Commit

Permalink
improved error handling, removed RC=$? noops
Browse files Browse the repository at this point in the history
  • Loading branch information
adrelanos committed Dec 22, 2023
1 parent 7a320f2 commit 9706bd9
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions grml-debootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -906,10 +906,12 @@ while IFS= read -r i; do
done < "$TMPFILE"

ERRORFILE=$(mktemp)

local RC=0
# shellcheck disable=SC2086
yes | mdadm --create "${TARGET}" --level="${RAIDLEVEL}" \
--raid-devices="${NUM_PARTITIONS}" ${SELECTED_PARTITIONS} >/dev/null 2>$ERRORFILE
RC=$?
--raid-devices="${NUM_PARTITIONS}" ${SELECTED_PARTITIONS} >/dev/null 2>$ERRORFILE || RC=$?

if [ "$RC" = 0 ] ; then
dialog --title "$PN" --msgbox \
"Creating $TARGET was successful." 0 0
Expand Down Expand Up @@ -967,9 +969,7 @@ format_efi_partition() {
einfo "EFI partition $EFI seems to have a FAT filesystem, not modifying."
else
einfo "EFI partition $EFI doesn't seem to be formatted, creating filesystem."
mkfs.fat -F32 -n "EFI" "$EFI"
RC=$?
if [ ! $RC -eq 0 ] ; then
if ! mkfs.fat -F32 -n "EFI" "$EFI" ; then
eerror "Error while creating filesystem on ${EFI}."
bailout 1
fi
Expand Down Expand Up @@ -1315,7 +1315,7 @@ mkfs() {

einfo "Running $MKFS $MKFS_OPTS on $TARGET"
# shellcheck disable=SC2086
"$MKFS" $MKFS_OPTS "$TARGET" ; RC=$?
"$MKFS" $MKFS_OPTS "$TARGET"

if [ "$FIXED_DISK_IDENTIFIERS" = "yes" ] ; then
if ! echo "$MKFS" | grep -q "mkfs.ext" ; then
Expand Down Expand Up @@ -1728,13 +1728,11 @@ debootstrap_system() {
einfo "Executing: $DEBOOTSTRAP $ARCHCMD $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $ISO"
# shellcheck disable=SC2086
"$DEBOOTSTRAP" $ARCHCMD $DEBOOTSTRAP_OPT "$RELEASE" "$MNTPOINT" "$ISO"
RC=$?
else
einfo "Running $DEBOOTSTRAP $DEBOOTSTRAP_OPT for release ${RELEASE}${ARCHINFO} using ${MIRROR}"
einfo "Executing: $DEBOOTSTRAP $ARCHCMD $DEBOOTSTRAP_OPT $RELEASE $MNTPOINT $MIRROR"
# shellcheck disable=SC2086
"$DEBOOTSTRAP" $ARCHCMD $DEBOOTSTRAP_OPT "$RELEASE" "$MNTPOINT" "$MIRROR"
RC=$?
fi

if [ $RC -ne 0 ] ; then

Check warning on line 1738 in grml-debootstrap

View workflow job for this annotation

GitHub Actions / shellcheck grml-debootstrap

[shellcheck] reported by reviewdog 🐶 Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086) Raw Output: ./grml-debootstrap:1738:8:info:Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Check failure on line 1738 in grml-debootstrap

View workflow job for this annotation

GitHub Actions / shellcheck grml-debootstrap

[shellcheck (suggestion)] reported by reviewdog 🐶 Raw Output: grml-debootstrap:1738:- if [ $RC -ne 0 ] ; then grml-debootstrap:1738:+ if [ "$RC" -ne 0 ] ; then
Expand Down Expand Up @@ -2065,9 +2063,9 @@ chrootscript() {
mount -t devtmpfs udev "${MNTPOINT}"/dev
mount -t devpts devpts "${MNTPOINT}"/dev/pts
if [ "$DEBUG" = "true" ] ; then
chroot "$MNTPOINT" /bin/bash -x /bin/chroot-script ; RC=$?
chroot "$MNTPOINT" /bin/bash -x /bin/chroot-script
else
chroot "$MNTPOINT" /bin/chroot-script ; RC=$?
chroot "$MNTPOINT" /bin/chroot-script
fi
try_umount 3 "$MNTPOINT"/dev/pts
try_umount 3 "$MNTPOINT"/dev
Expand Down

0 comments on commit 9706bd9

Please sign in to comment.