lilalo

diff install @ 158:d775ffd49dbf

minifix: bsd/darwin in uname
author Igor Chubin <igor@chub.in>
date Wed Feb 01 17:14:54 2012 +0200 (2012-02-01)
parents 93e08c4b54ed
children
line diff
     1.1 --- a/install	Mon Jul 21 11:24:53 2008 +0300
     1.2 +++ b/install	Wed Feb 01 17:14:54 2012 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  #!/bin/sh
     1.5  
     1.6  hostname=`hostname`
     1.7 -uname -a | grep -qi freebsd || hostname=`hostname -f`
     1.8 +uname -a | egrep -qi '(freebsd|darwin)' || hostname=`hostname -f`
     1.9  
    1.10  ###############################################################################
    1.11  #
    1.12 @@ -30,7 +30,7 @@
    1.13  apt_get_install_this="perl make libmodule-build-perl libc6-dev gcc"
    1.14  
    1.15  wget=wget
    1.16 -uname -a | grep -qi bsd && wget=fetch
    1.17 +uname -a | egrep -qi '(bsd|darwin)' && wget=fetch
    1.18  
    1.19  normC='\033[0;39m'
    1.20  whiteC='\033[1;37m'
    1.21 @@ -79,7 +79,7 @@
    1.22  
    1.23  get_user_home()
    1.24  {
    1.25 -    uname -a | grep -qi freebsd && pw user show "$@"| awk -F: '{print $9}' || getent passwd "$@"| awk -F: '{print $6}'
    1.26 +    uname -a | egrep -qi '(freebsd|darwin)' && pw user show "$@"| awk -F: '{print $9}' || getent passwd "$@"| awk -F: '{print $6}'
    1.27  }
    1.28  
    1.29  install_to_users_homes()