Merge pull request #320 from BastilleBSD/fixes

more fixes

Author: tschettervictor

usr/local/bin/rocinante

@@ -118,19 +118,19 @@ case "${CMD}" in
     help|-h|--help)
         usage
         ;;
-    bootstrap \
-	cmd \
-    cp \
-	limits \
-	list \
-    pkg \
-    service \
-    sysctl \
-    sysrc \
-    template \
-	update \
-	upgrade \
-	verify \
+    bootstrap| \
+    cmd| \
+    cp| \
+    limits| \
+    list| \
+    pkg| \
+    service| \
+    sysctl| \
+    sysrc| \
+    template| \
+    update| \
+    upgrade| \
+    verify| \
     zfs)
         ;;
     *)
@@ -152,4 +152,4 @@ if [ -f "${SCRIPTPATH}" ]; then
     fi
 else
     error_exit "${SCRIPTPATH} not found."
-fi
+fi

usr/local/libexec/rocinante/template.sh

@@ -105,8 +105,8 @@ render() {
 
 line_in_file() {
 
-    local file_path="${1}"
-    local line="${2}"
+    local line="${1%% *}"
+    local file_path="${1#* }"
 
     if [ -f "${file_path}" ]; then
         if ! grep -qxF "${line}" "${file_path}"; then
@@ -245,7 +245,6 @@ echo "Applying template: ${TEMPLATE}..."
 
 # Build a list of sed commands like this: -e 's/${username}/root/g' -e 's/${domain}/example.com/g'
 # Values provided by default (without being defined by the user) are listed here. -- cwells
-ARG_REPLACEMENTS="-e 's/\${JAIL_IP}/${_jail_ip}/g' -e 's/\${JAIL_NAME}/${_jail}/g'"
 # This is parsed outside the HOOKS loop so an ARG file can be used with a Bastillefile. -- cwells
 if [ -s "${rocinante_template}/ARG" ]; then
     while read _line; do