From 9eeb4ed216b0eede48eadb03dc8d84de597652e2 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Mon, 11 Jan 2010 17:04:44 +0000
Subject: Remove bashism, use freebsd-updates way to wait randomly. Thanks to
 Panagiotis J. Christias

---
 ezjail-admin | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/ezjail-admin b/ezjail-admin
index 1e8207b..599c82c 100755
--- a/ezjail-admin
+++ b/ezjail-admin
@@ -793,11 +793,9 @@ setup|update)
     [ -d "${ezjail_jailbase}" ] || exerr "Error: base jail does not exist.\n  You cannot update a base jail until it is created.\n  Please run '${ezjail_admin} update' or '${ezjail_admin} install' first."
 
     # If ran from cron be kind to freebsds update servers and sleep first
-    [ -z "$TERM" -o "$TERM" = "dumb" ] && sleep $(( ${RANDOM} % 3600 ))
-    if [ "${ezjail_use_zfs}" = "YES" ]; then
-      zfs snapshot ${ezjail_jailzfs}/basejail@`date -v -7d +"%C%y%m%d_%H:%M:%S"`
-    fi
-    freebsd-update -b ${ezjail_jailbase} fetch install
+    [ -z "$TERM" -o "$TERM" = "dumb" ] && ezjail_urgency="cron" || ezjail_urgency="fetch"
+    [ "${ezjail_use_zfs}" = "YES" ] && zfs snapshot ${ezjail_jailzfs}/basejail@`date -v -7d +"%C%y%m%d_%H:%M:%S"`
+    freebsd-update -b ${ezjail_jailbase} ${ezjail_urgency} install
   else
     # Bump the user for some of the most common errors
     [ -d "${ezjail_sourcetree}" ] || exerr "Error: Cannot find your copy of the FreeBSD source tree in ${ezjail_sourcetree}.\n  Consider using '${ezjail_admin} install' to create the base jail from an ftp server."
-- 
cgit v1.2.3