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

Diff for /openbsd/sxxu/Attic/install.sxxu between version 1.11 and 1.18

version 1.11, 2010/04/22 21:36:24 version 1.18, 2010/04/23 22:27:27
Line 25 
Line 25 
 export PKG_PATH  export PKG_PATH
   
 do_pre() {  do_pre() {
     # nothing to do      echo 'Running post install from sxxu'
 }  }
   
 do_post() {  do_post() {
     # nothing to do      echo 'See /var/log/install.log for install messages.'
 }  }
   
 process_roles() {  process_roles() {
Line 42 
Line 42 
     fi      fi
   
     local _roles      local _roles
       unset _roles
     set -A _roles      set -A _roles
     local _role      local _role
     while read _role; do      while read _role; do
         if [ -n "${_role}" ]; then      if [ -n "${_role}" ]; then
                 _roles[${#_roles[@]}]="$_role"              _role=${_role%%#*}              # strip comments
         fi              test -z "$_role" && continue
               _roles[${#_roles[@]}]="$_role"
       fi
     done < roles      done < roles
   
     for _role in "${_roles[@]}"; do      for _role in "${_roles[@]}"; do
Line 64 
Line 67 
     echo ' ==> Setting PKG_PATH'      echo ' ==> Setting PKG_PATH'
     local _line      local _line
     while read _line; do      while read _line; do
           _line=${_line%%#*}              # strip comments
           test -z "$_line" && continue
         if [ -z "${PKG_PATH}" ]; then          if [ -z "${PKG_PATH}" ]; then
             PKG_PATH="$_line"              PKG_PATH="$_line"
         else          else
             PKG_PATH="${PKG_PATH}:${_line}"              PKG_PATH="${PKG_PATH}:${_line}"
         fi          fi
     done < pkg_path      done < pkg_path
   
     PKG_PATH=`eval echo $PKG_PATH`      PKG_PATH=`eval echo $PKG_PATH`
 }  }
   
Line 84 
Line 90 
         echo " ==> Running $_cmd $_args"          echo " ==> Running $_cmd $_args"
         local _line          local _line
         while read _line; do          while read _line; do
             echo "  => ${_line}"              _line=${_line%%#*}              # strip comments
               test -z "$_line" && continue
               echo "  => ${_cmd} ${_args} ${_line}"
             eval ${_cmd} ${_args} ${_line}              eval ${_cmd} ${_args} ${_line}
         done < ${_f}          done < "${_f}"
     done      done
 }  }
   
Line 101 
Line 109 
         # -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 -d / < $_p          patch -N -t -p0 -d / < "$_p"
     done      done
 }  }
   
Line 123 
Line 131 
         return          return
     fi      fi
   
     echo "===> Applying ${_role}"      echo "===> Applying role ${_role}"
   
     cd "${_rolepwd}"      cd "${_rolepwd}"
     if [ -e ./siteXXrc ]; then      if [ -e ./siteXXrc ]; then
Line 156 
Line 164 
     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 | grep '^...>'
 do_post  do_post       2>&1 | /usr/bin/tee -a /var/log/install.log
Legend:
Removed from v.1.11  
changed lines
  Added in v.1.18
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>