[BACK]Return to sxxu CVS log [TXT][DIR] Up to [local] / openbsd / sxxu

Diff for /openbsd/sxxu/Attic/sxxu between version 1.17 and 1.18

version 1.17, 2010/04/20 18:25:50 version 1.18, 2010/04/20 18:25:51
Line 1 
Line 1 
 #!/bin/sh  #!/bin/ksh -
   #
 # $Id$  # $Id$
   #
 # Copyright (c) 2010 Andrew Fresh <andrew@afresh1.com>  # Copyright (c) 2010 Andrew Fresh <andrew@afresh1.com>
 #  #
 # Permission to use, copy, modify, and distribute this software for any  # Permission to use, copy, modify, and distribute this software for any
Line 82 
Line 83 
         WRKINST="${WRKDIR}/${_site}"          WRKINST="${WRKDIR}/${_site}"
   
         if [ -z "${NORECURSE}" -o ! -e "${WRKINST}" ]; then          if [ -z "${NORECURSE}" -o ! -e "${WRKINST}" ]; then
               mkdir -p "${WRKINST}"
             echo -n "\n ==>  including:"              echo -n "\n ==>  including:"
             include "${_machine}"  
         fi  
   
         if [ -z "$NORECURSE" ]; then              if [ -z "$NORECURSE" ]; then
             if [ X"${_machine}" != X"${COMMONDIR}" \                  if [ -e "${INSTALL_SITE}" ]; then
                 -a -d "${SRCDIR}/${COMMONDIR}" ]; then                      echo -n ' install.site'
                 include $COMMONDIR                      cp ${INSTALL_SITE} "$WRKINST/install.site"
             fi                  fi
   
             if [ -e "${INSTALL_SITE}" ]; then                  if [ X"${_machine}" != X"${COMMONDIR}" \
                 cp ${INSTALL_SITE} "$WRKINST/install.site"                      -a -d "${SRCDIR}/${COMMONDIR}" ]; then
                       include $COMMONDIR
                   fi
             fi              fi
   
               include "${_machine}"
         fi          fi
   
         if [ -n "${REGEN_MTREE}" ]; then          if [ -n "${REGEN_MTREE}" ]; then
Line 171 
Line 175 
     fi      fi
     mkdir -p "$_siteXX_dst"      mkdir -p "$_siteXX_dst"
   
     echo -n " $_src"  
   
     copy_special "${SRCDIR}/${_src}" "${WRKINST}"  
   
     if [ -d "$_siteXX_src" ]; then      if [ -d "$_siteXX_src" ]; then
           if [ -z "${NORECURSE}" -a -e "${_siteXX_src}/roles" ]; then
               local _role
               while read _role; do
                   include "$_role"
               done < "${_siteXX_src}/roles"
           fi
   
         copy_special "$_siteXX_src" "$_siteXX_dst"          copy_special "$_siteXX_src" "$_siteXX_dst"
   
         if [ -z "${REGEN_MTREE}" -a -e "${_siteXX_src}/mtree" ]; then          if [ -z "${REGEN_MTREE}" -a -e "${_siteXX_src}/mtree" ]; then
Line 190 
Line 197 
             rm -f $_mtree_out              rm -f $_mtree_out
         fi          fi
   
         [ -n "${NORECURSE}" ] && return  
   
         if [ -e "${_siteXX_src}/roles" ]; then  
             local _role  
             while read _role; do  
                 include "$_role"  
             done < "${_siteXX_src}/roles"  
         fi  
     fi      fi
   
       echo -n " $_src"
       copy_special "${SRCDIR}/${_src}" "${WRKINST}"
 }  }
   
 usage() {  usage() {
Legend:
Removed from v.1.17  
changed lines
  Added in v.1.18
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>