===================================================================
RCS file: /cvs/openbsd/sxxu/Attic/install.sxxu,v
retrieving revision 1.10
retrieving revision 1.16
diff -u -r1.10 -r1.16
--- openbsd/sxxu/Attic/install.sxxu	2010/04/21 20:13:08	1.10
+++ openbsd/sxxu/Attic/install.sxxu	2010/04/23 00:01:30	1.16
@@ -1,5 +1,5 @@
 #!/bin/ksh -
-# $Id: install.sxxu,v 1.10 2010/04/21 19:13:08 andrew Exp $
+# $Id: install.sxxu,v 1.16 2010/04/22 23:01:30 andrew Exp $
 
 # Copyright (c) 2010 Andrew Fresh <andrew@afresh1.com>
 #
@@ -25,13 +25,29 @@
 export PKG_PATH
 
 do_pre() {
-    # nothing to do
+    echo 'Running post install from sxxu'
 }
 
 do_post() {
-    # nothing to do
+    echo 'See /var/log/install.log for install messages.'
 }
 
+# Strip comments (and leading/trailing whitespace if IFS is set)
+# from a file and spew to stdout
+stripcom() {
+    local _file="$1"
+    local _line
+
+    {
+        while read _line ; do
+            _line=${_line%%#*}              # strip comments
+            test -z "$_line" && continue
+            echo $_line
+        done
+    } < $_file
+}
+
+
 process_roles() {
     local _oldpwd="${PWD}"
 
@@ -42,13 +58,14 @@
     fi
 
     local _roles
+    unset _roles
     set -A _roles
     local _role
-    while read _role; do
-	if [ -n "${_role}" ]; then
-        	_roles[${#_roles[@]}]="$_role"
-	fi
-    done < roles
+    stripcom roles | while read _role; do
+    if [ -n "${_role}" ]; then
+            _roles[${#_roles[@]}]="$_role"
+    fi
+    done
     
     for _role in "${_roles[@]}"; do
         apply_role "$_role"
@@ -63,13 +80,14 @@
 
     echo ' ==> Setting PKG_PATH'
     local _line
-    while read _line; do
+    stripcom pkg_path | while read _line; do
         if [ -z "${PKG_PATH}" ]; then
             PKG_PATH="$_line"
         else
             PKG_PATH="${PKG_PATH}:${_line}"
         fi
-    done < pkg_path
+    done
+
     PKG_PATH=`eval echo $PKG_PATH`
 }
 
@@ -83,10 +101,10 @@
 
         echo " ==> Running $_cmd $_args"
         local _line
-        while read _line; do
-            echo "  => ${_line}"
+        stripcom "${_f}" | while read _line; do
+            echo "  => ${_cmd} ${_args} ${_line}"
             eval ${_cmd} ${_args} ${_line}
-        done < ${_f}
+        done
     done
 }
 
@@ -96,11 +114,12 @@
     echo ' ==> Applying patches'
     local _p
     for _p in patches/*; do
+        [ X"patches/*" == X"${_p}" ] && continue
         echo "  => $_p"
         # -N Always assume a forward patch.
         # -t Never prompt; assume the user is expert
         # -p0 full path, always
-        patch -N -t -p0 -d / < $_p
+        patch -N -t -p0 -d / < "$_p"
     done
 }
 
@@ -122,7 +141,7 @@
         return
     fi
 
-    echo "===> Applying ${_role}"
+    echo "===> Applying role ${_role}"
 
     cd "${_rolepwd}"
     if [ -e ./siteXXrc ]; then
@@ -155,6 +174,6 @@
     exit
 fi
 
-do_pre
-process_roles
-do_post
+do_pre        2>&1 | /usr/bin/tee    /var/log/install.log
+process_roles 2>&1 | /usr/bin/tee -a /var/log/install.log | grep '^...>'
+do_post       2>&1 | /usr/bin/tee -a /var/log/install.log