[PC-BSD Commits] r7375 - in pcbsd-projects/warden: conf scripts/backend

[svn at pcbsd.org]

Author: kris
Date: 2010-08-11 09:02:55 -0700 (Wed, 11 Aug 2010)
New Revision: 7375

Modified:
   pcbsd-projects/warden/conf/warden.conf
   pcbsd-projects/warden/scripts/backend/listjails.sh
Log:

Mark Warden as 1.1, and fix a bug when using /bin/sh instead of bash substitution



Modified: pcbsd-projects/warden/conf/warden.conf
===================================================================
--- pcbsd-projects/warden/conf/warden.conf	2010-08-11 13:34:30 UTC (rev 7374)
+++ pcbsd-projects/warden/conf/warden.conf	2010-08-11 16:02:55 UTC (rev 7375)
@@ -39,7 +39,7 @@
 export ATMP
 
 # Warden Version
-WARDENVER="1.0"
+WARDENVER="1.1"
 export WARDENVER
 
 # Function to ask the user to press Return to continue

Modified: pcbsd-projects/warden/scripts/backend/listjails.sh
===================================================================
--- pcbsd-projects/warden/scripts/backend/listjails.sh	2010-08-11 13:34:30 UTC (rev 7374)
+++ pcbsd-projects/warden/scripts/backend/listjails.sh	2010-08-11 16:02:55 UTC (rev 7375)
@@ -55,10 +55,11 @@
   fi
 
   # Pad the variables a bit
-  AUTO="${AUTO}          "
-  STATUS="${STATUS}          "
-  HOST="${HOST}          "
+  AUTO=`echo "${AUTO}          " | cut -c 1-15`
+  STATUS=`echo "${STATUS}          " | cut -c 1-10`
+  HOST=`echo "${HOST}          " | cut -c 1-15`
+  
 
-  echo -e "${i:0:15}	${HOST:0:15}	${AUTO:0:15}	${STATUS:0:10}"
+  echo -e "${i}	${HOST}	${AUTO}	${STATUS}"
 done