=================================================================== RCS file: /cvs/openbsd/sxxu/Attic/install.sxxu,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- openbsd/sxxu/Attic/install.sxxu 2010/04/22 23:01:41 1.13 +++ openbsd/sxxu/Attic/install.sxxu 2010/04/22 23:25:00 1.14 @@ -1,5 +1,5 @@ #!/bin/ksh - -# $Id: install.sxxu,v 1.13 2010/04/22 22:01:41 andrew Exp $ +# $Id: install.sxxu,v 1.14 2010/04/22 22:25:00 andrew Exp $ # Copyright (c) 2010 Andrew Fresh # @@ -25,11 +25,11 @@ 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.' } process_roles() { @@ -45,9 +45,9 @@ set -A _roles local _role while read _role; do - if [ -n "${_role}" ]; then - _roles[${#_roles[@]}]="$_role" - fi + if [ -n "${_role}" ]; then + _roles[${#_roles[@]}]="$_role" + fi done < roles for _role in "${_roles[@]}"; do @@ -84,7 +84,7 @@ echo " ==> Running $_cmd $_args" local _line while read _line; do - echo " => ${_line}" + echo " => ${_cmd} ${_args} ${_line}" eval ${_cmd} ${_args} ${_line} done < ${_f} done @@ -158,5 +158,4 @@ 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 | grep '^...>' -echo See /var/log/install.log for install messages. +do_post 2>&1 | /usr/bin/tee -a /var/log/install.log