===================================================================
RCS file: /cvs/openbsd/sxxu/Attic/install.sxxu,v
retrieving revision 1.15
retrieving revision 1.20
diff -u -r1.15 -r1.20
--- openbsd/sxxu/Attic/install.sxxu	2010/04/22 23:50:42	1.15
+++ openbsd/sxxu/Attic/install.sxxu	2013/04/20 22:36:26	1.20
@@ -1,5 +1,5 @@
 #!/bin/ksh -
-# $Id: install.sxxu,v 1.15 2010/04/22 22:50:42 andrew Exp $
+# $Id: install.sxxu,v 1.20 2013/04/20 21:36:26 andrew Exp $
 
 # Copyright (c) 2010 Andrew Fresh <andrew@afresh1.com>
 #
@@ -20,7 +20,7 @@
 
 BASEDIR=/var/siteXX
 useradd_args="-m -gid =uid"
-[ -e /var/siteXX/siteXXrc ] && . /var/siteXX/siteXXrc
+[ -e $BASEDIR/siteXXrc ] && . $BASEDIR/siteXXrc
 
 export PKG_PATH
 
@@ -42,10 +42,13 @@
     fi
 
     local _roles
+    unset _roles
     set -A _roles
     local _role
     while read _role; do
     if [ -n "${_role}" ]; then
+            _role=${_role%%#*}              # strip comments
+            test -z "$_role" && continue
             _roles[${#_roles[@]}]="$_role"
     fi
     done < roles
@@ -59,18 +62,19 @@
 
 
 append_pkg_path() {
-    [ ! -e pkg_path ] && return
+    [ -e pkg_path -o -d packages ] || return
 
     echo ' ==> Setting PKG_PATH'
+    [ -d packages ] && PKG_PATH="${PKG_PATH}:${PWD}/packages"
+    [ -e pkg_path ] || return;
     local _line
     while read _line; do
-        if [ -z "${PKG_PATH}" ]; then
-            PKG_PATH="$_line"
-        else
-            PKG_PATH="${PKG_PATH}:${_line}"
-        fi
+        _line=${_line%%#*}              # strip comments
+        [ -z "$_line" ] && continue
+        PKG_PATH="${PKG_PATH}:${_line}"
     done < pkg_path
-    PKG_PATH=`eval echo $PKG_PATH`
+
+    PKG_PATH=`eval echo $PKG_PATH | sed -e 's/^:*//'`
 }
 
 run_command_lists() {
@@ -84,9 +88,11 @@
         echo " ==> Running $_cmd $_args"
         local _line
         while read _line; do
+            _line=${_line%%#*}              # strip comments
+            test -z "$_line" && continue
             echo "  => ${_cmd} ${_args} ${_line}"
             eval ${_cmd} ${_args} ${_line}
-        done < ${_f}
+        done < "${_f}"
     done
 }
 
@@ -101,7 +107,7 @@
         # -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
 }