From ffdff96bef9a9976b765bb4e7ef3d0a0406860fa Mon Sep 17 00:00:00 2001
From: CyberLeo <cyberleo@cyberleo.net>
Date: Sat, 7 May 2011 01:35:31 -0500
Subject: [PATCH] script/gentree: normalize function conditions

---
 script/gentree | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/script/gentree b/script/gentree
index dcecac0..000a2fa 100755
--- a/script/gentree
+++ b/script/gentree
@@ -125,24 +125,24 @@ do_admin() {
 }
 
 do_overlay() {
-  log Apply overlay from "${ovly##${base}/}"
   [ -d "${ovly}" ] || return
+  log Apply overlay from "${ovly##${base}/}"
   ( cd "${ovly}" && find . | cpio -p "${sroot}" ) || chk
 }
 
 do_packages() {
-  if [ -d "${pkgs}" -a "$(ls -1 "${pkgs}" | wc -l)" -gt 0 ]
-  then
-    count="$(ls -1 "${pkgs}" | wc -l)"
-    log Install ${count} packages from "${pkgs##${base}/}"
-    chk mkdir -p "${sroot}/pkg"
-    ( cd "${pkgs}" && find . | cpio -p --link "${sroot}/pkg" ) || chk
-    chk chroot "${sroot}" /bin/sh -c 'cd /pkg; exec pkg_add -F *'
-    chk rm -Rf "${sroot}/pkg"
-  fi
+  [ -d "${pkgs}" ] || return
+  count="$(ls -1 "${pkgs}" | wc -l)"
+  [ "${count}" -gt 0 ] || return
+  log Install ${count} packages from "${pkgs##${base}/}"
+  chk mkdir -p "${sroot}/pkg"
+  ( cd "${pkgs}" && find . | cpio -p --link "${sroot}/pkg" ) || chk
+  chk chroot "${sroot}" /bin/sh -c 'cd /pkg; exec pkg_add -F *'
+  chk rm -Rf "${sroot}/pkg"
 }
 
 do_patch() {
+  [ -d "${ptch}" ] || return
   log Apply patches from "${ptch##${base}/}"
   for file in "${ptch}"/*
   do
-- 
2.42.0