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

Diff for /openbsd/sxxu/Attic/install.sxxu between version 1.8 and 1.12

version 1.8, 2010/04/21 00:21:59 version 1.12, 2010/04/22 22:24:29
Line 19 
Line 19 
 # Copyright (c) 2006 Alex Holst <a@mongers.org>  # Copyright (c) 2006 Alex Holst <a@mongers.org>
   
 BASEDIR=/var/siteXX  BASEDIR=/var/siteXX
 user_add_args="-m -gid =uid"  useradd_args="-m -gid =uid"
 [ -e /var/siteXX/siteXXrc ] && . /var/siteXX/siteXXrc  [ -e /var/siteXX/siteXXrc ] && . /var/siteXX/siteXXrc
   
 export PKG_PATH  export PKG_PATH
Line 45 
Line 45 
     set -A _roles      set -A _roles
     local _role      local _role
     while read _role; do      while read _role; do
         _roles[${#_roles[@]}]="$_role"          if [ -n "${_role}" ]; then
                   _roles[${#_roles[@]}]="$_role"
           fi
     done < roles      done < roles
   
     for _role in "${_roles[@]}"; do      for _role in "${_roles[@]}"; do
Line 68 
Line 70 
             PKG_PATH="${PKG_PATH}:${_line}"              PKG_PATH="${PKG_PATH}:${_line}"
         fi          fi
     done < pkg_path      done < pkg_path
       PKG_PATH=`eval echo $PKG_PATH`
 }  }
   
 run_command_lists() {  run_command_lists() {
Line 92 
Line 95 
   
     echo ' ==> Applying patches'      echo ' ==> Applying patches'
     local _p      local _p
     for _p in /patches/*; do      for _p in patches/*; do
           [ X"patches/*" == X"${_p}" ] && continue
         echo "  => $_p"          echo "  => $_p"
         # -N Always assume a forward patch.          # -N Always assume a forward patch.
         # -t Never prompt; assume the user is expert          # -t Never prompt; assume the user is expert
         # -p0 full path, always          # -p0 full path, always
         patch -N -t -p0 < $_p          patch -N -t -p0 -d / < $_p
     done      done
 }  }
   
Line 111 
Line 115 
 apply_role() {  apply_role() {
     local _role="$1"      local _role="$1"
   
     if [ ! -d "${_role}" ]; then      local _oldpwd="${PWD}"
       local _rolepwd="${BASEDIR}/${_role}"
   
       if [ ! -d "${_rolepwd}" ]; then
         echo "===> Missing ${_role}"          echo "===> Missing ${_role}"
         return          return
     fi      fi
   
     echo "===> Applying ${_role}"      echo "===> Applying ${_role}"
   
     local _oldpwd="${PWD}"      cd "${_rolepwd}"
     cd "${_role}"      if [ -e ./siteXXrc ]; then
     local _rolepwd="${PWD}"  
   
     if [ -e siteXXrc ]; then  
         echo ' ==> Including siteXXrc'          echo ' ==> Including siteXXrc'
         . siteXXrc          . ./siteXXrc
     fi      fi
   
     cd "${_rolepwd}" && append_pkg_path      cd "${_rolepwd}" && append_pkg_path
Line 132 
Line 136 
     cd "${_rolepwd}" && apply_patches      cd "${_rolepwd}" && apply_patches
     cd "${_rolepwd}" && install_packages      cd "${_rolepwd}" && install_packages
   
     if [ -e install.site ]; then      cd "${_rolepwd}"
         cd "${_rolepwd}"      if [ -e ./install.site ]; then
         if [ -x install.site ]; then          if [ -x ./install.site ]; then
             echo ' ==> Running install.site'              echo ' ==> Running install.site'
             ./install.site              ./install.site
         else          else
             echo ' ==> Including install.site'              echo ' ==> Including install.site'
             . install.site              . ./install.site
         fi          fi
     fi      fi
   
Line 152 
Line 156 
     exit      exit
 fi  fi
   
 do_pre  do_pre        2>&1 | /usr/bin/tee    /var/log/install.log
 process_roles  process_roles 2>&1 | /usr/bin/tee -a /var/log/install.log
 do_post  do_post       2>&1 | /usr/bin/tee -a /var/log/install.log
Legend:
Removed from v.1.8  
changed lines
  Added in v.1.12
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>