git: 64b9e40dc5ba - main - release: style: prefer `-n` over `! -z`
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 29 Apr 2025 17:18:50 UTC
The branch main has been updated by brooks:
URL: https://cgit.FreeBSD.org/src/commit/?id=64b9e40dc5ba51fd91d098c48f7e57476c324169
commit 64b9e40dc5ba51fd91d098c48f7e57476c324169
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2025-04-29 17:15:22 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2025-04-29 17:18:33 +0000
release: style: prefer `-n` over `! -z`
This is (nearly) universally the style of other shell scripts.
Reviewed by: cperciva, imp, emaste
Differential Revision: https://reviews.freebsd.org/D50056
---
release/packages/generate-ucl.sh | 6 +++---
release/release.sh | 16 ++++++++--------
release/scripts/atlas-upload.sh | 2 +-
release/scripts/mk-vmimage.sh | 2 +-
release/scripts/pkg-stage.sh | 2 +-
release/tools/arm.subr | 2 +-
release/tools/gce.conf | 2 +-
release/tools/vmimage.subr | 4 ++--
8 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
index 72db4a3180b8..b7d6875b3eb1 100755
--- a/release/packages/generate-ucl.sh
+++ b/release/packages/generate-ucl.sh
@@ -108,7 +108,7 @@ main() {
uclsource="${srctree}/release/packages/template.ucl"
- if [ ! -z "${debug}" ]; then
+ if [ -n "${debug}" ]; then
echo ""
echo "==============================================================="
echo "DEBUG:"
@@ -128,11 +128,11 @@ main() {
fi
[ -z "${comment}" ] && comment="${outname} package"
- [ ! -z "${_descr}" ] && comment="${comment} (${_descr})"
+ [ -n "${_descr}" ] && comment="${comment} (${_descr})"
[ -z "${desc}" ] && desc="${outname} package"
cp "${uclsource}" "${uclfile}"
- if [ ! -z "${pkgdeps}" ]; then
+ if [ -n "${pkgdeps}" ]; then
echo 'deps: {' >> ${uclfile}
for dep in ${pkgdeps}; do
cat <<EOF >> ${uclfile}
diff --git a/release/release.sh b/release/release.sh
index 5a6de297f7a1..8f0624e57344 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -62,7 +62,7 @@ env_setup() {
# The default version control system command to obtain the sources.
for _dir in /usr/bin /usr/local/bin; do
[ -x "${_dir}/git" ] && VCSCMD="/${_dir}/git"
- [ ! -z "${VCSCMD}" ] && break 2
+ [ -n "${VCSCMD}" ] && break 2
done
if [ -z "${VCSCMD}" -a -z "${NOGIT}" ]; then
@@ -182,7 +182,7 @@ env_check() {
fi
# Unset CHROOTBUILD_SKIP if the chroot(8) does not appear to exist.
- if [ ! -z "${CHROOTBUILD_SKIP}" -a ! -e ${CHROOTDIR}/bin/sh ]; then
+ if [ -n "${CHROOTBUILD_SKIP}" -a ! -e ${CHROOTDIR}/bin/sh ]; then
CHROOTBUILD_SKIP=
fi
@@ -292,7 +292,7 @@ extra_chroot_setup() {
fi
fi
- if [ ! -z "${EMBEDDEDPORTS}" ]; then
+ if [ -n "${EMBEDDEDPORTS}" ]; then
_OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U)
REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION)
BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
@@ -317,7 +317,7 @@ extra_chroot_setup() {
# chroot_build_target(): Build the userland and kernel for the build target.
chroot_build_target() {
load_target_env
- if [ ! -z "${EMBEDDEDBUILD}" ]; then
+ if [ -n "${EMBEDDEDBUILD}" ]; then
RELEASE_WMAKEFLAGS="${RELEASE_WMAKEFLAGS} \
TARGET=${EMBEDDED_TARGET} \
TARGET_ARCH=${EMBEDDED_TARGET_ARCH}"
@@ -327,7 +327,7 @@ chroot_build_target() {
fi
eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_WMAKEFLAGS} buildworld
eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_KMAKEFLAGS} buildkernel
- if [ ! -z "${WITH_OCIIMAGES}" ]; then
+ if [ -n "${WITH_OCIIMAGES}" ]; then
eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_WMAKEFLAGS} packages
fi
@@ -337,7 +337,7 @@ chroot_build_target() {
# chroot_build_release(): Invoke the 'make release' target.
chroot_build_release() {
load_target_env
- if [ ! -z "${WITH_VMIMAGES}" ]; then
+ if [ -n "${WITH_VMIMAGES}" ]; then
if [ -z "${VMFORMATS}" ]; then
VMFORMATS="$(eval chroot ${CHROOTDIR} \
make -C /usr/src/release -V VMFORMATS)"
@@ -389,7 +389,7 @@ chroot_arm_build_release() {
*)
;;
esac
- [ ! -z "${RELEASECONF}" ] && . "${RELEASECONF}"
+ [ -n "${RELEASECONF}" ] && . "${RELEASECONF}"
export MAKE_FLAGS="${MAKE_FLAGS} TARGET=${EMBEDDED_TARGET}"
export MAKE_FLAGS="${MAKE_FLAGS} TARGET_ARCH=${EMBEDDED_TARGET_ARCH}"
export MAKE_FLAGS="${MAKE_FLAGS} ${CONF_FILES}"
@@ -439,7 +439,7 @@ main() {
esac
done
shift $(($OPTIND - 1))
- if [ ! -z "${RELEASECONF}" ]; then
+ if [ -n "${RELEASECONF}" ]; then
if [ -e "${RELEASECONF}" ]; then
. ${RELEASECONF}
else
diff --git a/release/scripts/atlas-upload.sh b/release/scripts/atlas-upload.sh
index 6fa1a6a2e9d4..b10588501886 100755
--- a/release/scripts/atlas-upload.sh
+++ b/release/scripts/atlas-upload.sh
@@ -144,7 +144,7 @@ main () {
echo "Validating"
VALIDRESULT=$(/usr/local/bin/curl -s "${ATLAS_UPLOAD_URL}/api/v1/box/${USERNAME}/${BOX}/version/${VERSION}/provider/${PROVIDER}?access_token=${KEY}")
HOSTED_TOKEN=$(echo $VALIDRESULT | sed -e 's/.*"hosted"://' -e 's/,.*$//')
- if [ ! -z ${TOKEN} -a "${HOSTED_TOKEN}" != "true" ]; then
+ if [ -n ${TOKEN} -a "${HOSTED_TOKEN}" != "true" ]; then
echo "Upload failed, try again."
exit 2
fi
diff --git a/release/scripts/mk-vmimage.sh b/release/scripts/mk-vmimage.sh
index dfd91f43140d..3ca369b04d8e 100755
--- a/release/scripts/mk-vmimage.sh
+++ b/release/scripts/mk-vmimage.sh
@@ -91,7 +91,7 @@ main() {
. "${VMBUILDCONF}"
- if [ ! -z "${VMCONFIG}" ] && [ ! -c "${VMCONFIG}" ]; then
+ if [ -n "${VMCONFIG}" ] && [ ! -c "${VMCONFIG}" ]; then
. "${VMCONFIG}"
fi
diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh
index 58b6d25fcccf..9f121e5ab011 100755
--- a/release/scripts/pkg-stage.sh
+++ b/release/scripts/pkg-stage.sh
@@ -53,7 +53,7 @@ export PKG_ALTABI=$(pkg --rootdir ${ROOTDIR} config ALTABI 2>/dev/null)
export PKG_REPODIR="packages/${PKG_ABI}"
/bin/mkdir -p ${ROOTDIR}/${PKG_REPODIR}
-if [ ! -z "${PKG_ALTABI}" ]; then
+if [ -n "${PKG_ALTABI}" ]; then
ln -s ${PKG_ABI} ${ROOTDIR}/packages/${PKG_ALTABI}
fi
diff --git a/release/tools/arm.subr b/release/tools/arm.subr
index 983c3ea75dc7..5c5ebd29681d 100644
--- a/release/tools/arm.subr
+++ b/release/tools/arm.subr
@@ -35,7 +35,7 @@ cleanup() {
umount_loop ${DESTDIR}/dev 2>/dev/null
fi
umount_loop ${DESTDIR}
- if [ ! -z "${mddev}" ]; then
+ if [ -n "${mddev}" ]; then
mdconfig -d -u ${mddev}
fi
diff --git a/release/tools/gce.conf b/release/tools/gce.conf
index 5ad83bcded53..fc72b381a02d 100644
--- a/release/tools/gce.conf
+++ b/release/tools/gce.conf
@@ -124,7 +124,7 @@ EOF
# Do everything except deleting resolv.conf since we construct our own
# Googlized resolv.conf file in vm_extra_install_base.
vm_emulation_cleanup() {
- if ! [ -z "${QEMUSTATIC}" ]; then
+ if [ -n "${QEMUSTATIC}" ]; then
rm -f ${DESTDIR}/${EMULATOR}
fi
umount_loop ${DESTDIR}/dev
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index 9b8813e6dc4a..ce0ea03c096c 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -110,7 +110,7 @@ vm_emulation_setup() {
if [ -n "${WITHOUT_QEMU}" ]; then
return 0
fi
- if ! [ -z "${QEMUSTATIC}" ]; then
+ if [ -n "${QEMUSTATIC}" ]; then
export EMULATOR=/qemu
cp ${QEMUSTATIC} ${DESTDIR}/${EMULATOR}
fi
@@ -133,7 +133,7 @@ vm_extra_install_base() {
}
vm_extra_enable_services() {
- if [ ! -z "${VM_RC_LIST}" ]; then
+ if [ -n "${VM_RC_LIST}" ]; then
for _rcvar in ${VM_RC_LIST}; do
echo ${_rcvar}_enable="YES" >> ${DESTDIR}/etc/rc.conf
done