More updates for build on the Mac

This commit is contained in:
Tom Eastep 2010-05-29 10:50:39 -07:00
parent 226eb6ca3e
commit 58ad0bc9e0
4 changed files with 18 additions and 7 deletions

View File

@ -83,7 +83,7 @@ delete_file() # $1 = file to delete
install_file() # $1 = source $2 = target $3 = mode install_file() # $1 = source $2 = target $3 = mode
{ {
run_install -T $OWNERSHIP -m $3 $1 ${2} run_install $T $OWNERSHIP -m $3 $1 ${2}
} }
# #
@ -132,6 +132,11 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
# #
case $(uname) in case $(uname) in
Darwin)
[ -z "$OWNER" ] && OWNER=root
[ -z "$GROUP" ] && GROUP=wheel
T=
;;
*) *)
[ -z "$OWNER" ] && OWNER=root [ -z "$OWNER" ] && OWNER=root
[ -z "$GROUP" ] && GROUP=root [ -z "$GROUP" ] && GROUP=root

View File

@ -82,7 +82,7 @@ delete_file() # $1 = file to delete
install_file() # $1 = source $2 = target $3 = mode install_file() # $1 = source $2 = target $3 = mode
{ {
run_install -T $OWNERSHIP -m $3 $1 ${2} run_install $T $OWNERSHIP -m $3 $1 ${2}
} }
# #
@ -132,6 +132,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
DEBIAN= DEBIAN=
CYGWIN= CYGWIN=
INSTALLD='-D' INSTALLD='-D'
T='-T'
case $(uname) in case $(uname) in
CYGWIN*) CYGWIN*)
@ -144,7 +145,8 @@ case $(uname) in
GROUP=$(id -gn) GROUP=$(id -gn)
;; ;;
Darwin) Darwin)
INSTALLD= INSTALLD='-d'
T=
;; ;;
*) *)
[ -z "$OWNER" ] && OWNER=root [ -z "$OWNER" ] && OWNER=root

View File

@ -82,7 +82,7 @@ delete_file() # $1 = file to delete
install_file() # $1 = source $2 = target $3 = mode install_file() # $1 = source $2 = target $3 = mode
{ {
run_install -T $OWNERSHIP -m $3 $1 ${2} run_install $T $OWNERSHIP -m $3 $1 ${2}
} }
# #
@ -94,6 +94,7 @@ install_file() # $1 = source $2 = target $3 = mode
# ARGS is "yes" if we've already parsed an argument # ARGS is "yes" if we've already parsed an argument
# #
ARGS="" ARGS=""
T="-T"
if [ -z "$DEST" ] ; then if [ -z "$DEST" ] ; then
DEST="/etc/init.d" DEST="/etc/init.d"
@ -133,7 +134,8 @@ case $(uname) in
[ -z "$OWNER" ] && OWNER=root [ -z "$OWNER" ] && OWNER=root
[ -z "$GROUP" ] && GROUP=wheel [ -z "$GROUP" ] && GROUP=wheel
MAC=Yes MAC=Yes
INSTALLD= INSTALLD=-d
T=
;; ;;
*) *)
[ -z "$OWNER" ] && OWNER=root [ -z "$OWNER" ] && OWNER=root

View File

@ -82,7 +82,7 @@ delete_file() # $1 = file to delete
install_file() # $1 = source $2 = target $3 = mode install_file() # $1 = source $2 = target $3 = mode
{ {
run_install -T $OWNERSHIP -m $3 $1 ${2} run_install $T $OWNERSHIP -m $3 $1 ${2}
} }
# #
@ -130,6 +130,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
# Determine where to install the firewall script # Determine where to install the firewall script
# #
INSTALLD='-D' INSTALLD='-D'
T='-T'
case $(uname) in case $(uname) in
CYGWIN*) CYGWIN*)
@ -142,7 +143,8 @@ case $(uname) in
GROUP=$(id -gn) GROUP=$(id -gn)
;; ;;
Darwin) Darwin)
INSTALLD= INSTALLD='-d'
T=
;; ;;
*) *)
[ -z "$OWNER" ] && OWNER=root [ -z "$OWNER" ] && OWNER=root