diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh index 4fd41e454..81bca053c 100755 --- a/Shorewall-init/install.sh +++ b/Shorewall-init/install.sh @@ -83,7 +83,7 @@ delete_file() # $1 = file to delete 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 + Darwin) + [ -z "$OWNER" ] && OWNER=root + [ -z "$GROUP" ] && GROUP=wheel + T= + ;; *) [ -z "$OWNER" ] && OWNER=root [ -z "$GROUP" ] && GROUP=root diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index af88c2de4..8a0bfdaf3 100755 --- a/Shorewall-lite/install.sh +++ b/Shorewall-lite/install.sh @@ -82,7 +82,7 @@ delete_file() # $1 = file to delete 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= CYGWIN= INSTALLD='-D' +T='-T' case $(uname) in CYGWIN*) @@ -144,7 +145,8 @@ case $(uname) in GROUP=$(id -gn) ;; Darwin) - INSTALLD= + INSTALLD='-d' + T= ;; *) [ -z "$OWNER" ] && OWNER=root diff --git a/Shorewall/install.sh b/Shorewall/install.sh index fc3bd38f8..3cfb44a6d 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -82,7 +82,7 @@ delete_file() # $1 = file to delete 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="" +T="-T" if [ -z "$DEST" ] ; then DEST="/etc/init.d" @@ -133,7 +134,8 @@ case $(uname) in [ -z "$OWNER" ] && OWNER=root [ -z "$GROUP" ] && GROUP=wheel MAC=Yes - INSTALLD= + INSTALLD=-d + T= ;; *) [ -z "$OWNER" ] && OWNER=root diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh index 45455b9fd..d91d26dfa 100755 --- a/Shorewall6-lite/install.sh +++ b/Shorewall6-lite/install.sh @@ -82,7 +82,7 @@ delete_file() # $1 = file to delete 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 # INSTALLD='-D' +T='-T' case $(uname) in CYGWIN*) @@ -142,7 +143,8 @@ case $(uname) in GROUP=$(id -gn) ;; Darwin) - INSTALLD= + INSTALLD='-d' + T= ;; *) [ -z "$OWNER" ] && OWNER=root