===================================================================
RCS file: /cvs/openbsd/sxxu/Attic/install.sxxu,v
retrieving revision 1.7
retrieving revision 1.11
diff -u -r1.7 -r1.11
--- openbsd/sxxu/Attic/install.sxxu	2010/04/20 18:26:00	1.7
+++ openbsd/sxxu/Attic/install.sxxu	2010/04/22 21:36:24	1.11
@@ -1,5 +1,5 @@
 #!/bin/ksh -
-# $Id: install.sxxu,v 1.7 2010/04/20 17:26:00 andrew Exp $
+# $Id: install.sxxu,v 1.11 2010/04/22 20:36:24 andrew Exp $
 
 # Copyright (c) 2010 Andrew Fresh <andrew@afresh1.com>
 #
@@ -19,7 +19,7 @@
 # Copyright (c) 2006 Alex Holst <a@mongers.org>
 
 BASEDIR=/var/siteXX
-user_add_args="-m -gid =uid"
+useradd_args="-m -gid =uid"
 [ -e /var/siteXX/siteXXrc ] && . /var/siteXX/siteXXrc
 
 export PKG_PATH
@@ -45,7 +45,9 @@
     set -A _roles
     local _role
     while read _role; do
-        _roles[${#_roles[@]}]="$_role"
+	if [ -n "${_role}" ]; then
+        	_roles[${#_roles[@]}]="$_role"
+	fi
     done < roles
     
     for _role in "${_roles[@]}"; do
@@ -68,6 +70,7 @@
             PKG_PATH="${PKG_PATH}:${_line}"
         fi
     done < pkg_path
+    PKG_PATH=`eval echo $PKG_PATH`
 }
 
 run_command_lists() {
@@ -92,12 +95,13 @@
 
     echo ' ==> Applying patches'
     local _p
-    for _p in /patches/*; do
+    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 < $_p
+        patch -N -t -p0 -d / < $_p
     done
 }
 
@@ -111,33 +115,35 @@
 apply_role() {
     local _role="$1"
 
-    if [ ! -d "${_role}" ]; then
+    local _oldpwd="${PWD}"
+    local _rolepwd="${BASEDIR}/${_role}"
+
+    if [ ! -d "${_rolepwd}" ]; then
         echo "===> Missing ${_role}"
         return
     fi
 
     echo "===> Applying ${_role}"
 
-    local _oldpwd="${PWD}"
-    cd "${_role}"
-
-    if [ -e siteXXrc ]; then
+    cd "${_rolepwd}"
+    if [ -e ./siteXXrc ]; then
         echo ' ==> Including siteXXrc'
-        . siteXXrc
+        . ./siteXXrc
     fi
 
-    append_pkg_path
-    run_command_lists
-    apply_patches
-    install_packages
+    cd "${_rolepwd}" && append_pkg_path
+    cd "${_rolepwd}" && run_command_lists
+    cd "${_rolepwd}" && apply_patches
+    cd "${_rolepwd}" && install_packages
 
-    if [ -e install.site ]; then
-        if [ -x install.site ]; then
+    cd "${_rolepwd}"
+    if [ -e ./install.site ]; then
+        if [ -x ./install.site ]; then
             echo ' ==> Running install.site'
             ./install.site
         else
             echo ' ==> Including install.site'
-            . install.site
+            . ./install.site
         fi
     fi