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

Diff for /openbsd/sxxu/Attic/install.sxxu between version 1.16 and 1.17

version 1.16, 2010/04/23 00:01:30 version 1.17, 2010/04/23 22:14:22
Line 32 
Line 32 
     echo 'See /var/log/install.log for install messages.'      echo 'See /var/log/install.log for install messages.'
 }  }
   
 # Strip comments (and leading/trailing whitespace if IFS is set)  
 # from a file and spew to stdout  
 stripcom() {  
     local _file="$1"  
     local _line  
   
     {  
         while read _line ; do  
             _line=${_line%%#*}              # strip comments  
             test -z "$_line" && continue  
             echo $_line  
         done  
     } < $_file  
 }  
   
   
 process_roles() {  process_roles() {
     local _oldpwd="${PWD}"      local _oldpwd="${PWD}"
   
Line 61 
Line 45 
     unset _roles      unset _roles
     set -A _roles      set -A _roles
     local _role      local _role
     stripcom roles | while read _role; do      while read _role; do
     if [ -n "${_role}" ]; then      if [ -n "${_role}" ]; then
               _line=${_line%%#*}              # strip comments
               test -z "$_line" && continue
             _roles[${#_roles[@]}]="$_role"              _roles[${#_roles[@]}]="$_role"
     fi      fi
     done      done < roles
   
     for _role in "${_roles[@]}"; do      for _role in "${_roles[@]}"; do
         apply_role "$_role"          apply_role "$_role"
Line 80 
Line 66 
   
     echo ' ==> Setting PKG_PATH'      echo ' ==> Setting PKG_PATH'
     local _line      local _line
     stripcom pkg_path | 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      done < pkg_path
   
     PKG_PATH=`eval echo $PKG_PATH`      PKG_PATH=`eval echo $PKG_PATH`
 }  }
Line 101 
Line 89 
   
         echo " ==> Running $_cmd $_args"          echo " ==> Running $_cmd $_args"
         local _line          local _line
         stripcom "${_f}" | while read _line; do          while read _line; do
               _line=${_line%%#*}              # strip comments
               test -z "$_line" && continue
             echo "  => ${_cmd} ${_args} ${_line}"              echo "  => ${_cmd} ${_args} ${_line}"
             eval ${_cmd} ${_args} ${_line}              eval ${_cmd} ${_args} ${_line}
         done          done < "${_f}"
     done      done
 }  }
   
Legend:
Removed from v.1.16  
changed lines
  Added in v.1.17
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>