From a495350d26d7a577bdc7b8a2c2912149932ac583 Mon Sep 17 00:00:00 2001
From: Christer Edwards <christer.edwards@gmail.com>
Date: Fri, 30 Nov 2018 09:12:43 -0700
Subject: [PATCH] 0.3.20181130 damned typos

---
 usr/local/bin/bastille      |  2 +-
 usr/local/etc/rc.d/bastille | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/usr/local/bin/bastille b/usr/local/bin/bastille
index 4f355bc7..e73d70a7 100755
--- a/usr/local/bin/bastille
+++ b/usr/local/bin/bastille
@@ -32,7 +32,7 @@
 . /usr/local/etc/bastille/bastille.conf
 
 ## version
-BASTILLE_VERSION="0.3.20181128"
+BASTILLE_VERSION="0.3.20181130"
 
 usage() {
     cat << EOF
diff --git a/usr/local/etc/rc.d/bastille b/usr/local/etc/rc.d/bastille
index 3466c036..7fd4f50a 100755
--- a/usr/local/etc/rc.d/bastille
+++ b/usr/local/etc/rc.d/bastille
@@ -19,13 +19,13 @@
 name=bastille
 rcvar=${name}_enable
 
-load_rc_config ${name}
-
 : ${bastille_enable:=NO}
 : ${bastille_list:="ALL"}
 
-start_command="/usr/local/bin/bastille start"
-stop_command="/usr/local/bin/bastille stop"
+command=/usr/local/bin/${name}
+start_cmd="bastille_start"
+stop_cmd="bastille_stop"
+restart_cmd="bastille_stop && bastille_start"
 
 bastille_start()
 {
@@ -38,7 +38,7 @@ bastille_start()
 
     for _jail in ${bastille_list}; do
         echo "Starting Bastille Jail: ${_jail}"
-        ${start_command} ${_jail}
+        ${command} start ${_jail}
     done
 }
 
@@ -53,8 +53,9 @@ bastille_stop()
 
     for _jail in ${bastille_list}; do
         echo "Stopping Bastille Jail: ${_jail}"
-        ${stop_command} ${_jail}
+        ${command} stop ${_jail}
     done
 }
 
+load_rc_config ${name}
 run_rc_command "$1"