Handle full-path-resolutions to detect the magic-ness of the pkg port.
This commit is contained in:
parent
d02d7de76c
commit
a52ce850e9
@ -160,7 +160,6 @@ fi
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
log_it() (
|
log_it() (
|
||||||
set +x
|
|
||||||
a="$*"
|
a="$*"
|
||||||
set `cat /tmp/_sb_log`
|
set `cat /tmp/_sb_log`
|
||||||
TX=`date +%s`
|
TX=`date +%s`
|
||||||
@ -175,7 +174,6 @@ log_it() (
|
|||||||
|
|
||||||
|
|
||||||
ports_recurse() (
|
ports_recurse() (
|
||||||
set +x
|
|
||||||
t=$1
|
t=$1
|
||||||
shift
|
shift
|
||||||
if [ "x$t" = "x." ] ; then
|
if [ "x$t" = "x." ] ; then
|
||||||
@ -218,7 +216,6 @@ ports_recurse() (
|
|||||||
)
|
)
|
||||||
|
|
||||||
ports_build() (
|
ports_build() (
|
||||||
set +x
|
|
||||||
|
|
||||||
ports_recurse . $PORTS_WE_WANT
|
ports_recurse . $PORTS_WE_WANT
|
||||||
|
|
||||||
@ -229,17 +226,21 @@ ports_build() (
|
|||||||
t=`echo $p | sed 's,/usr/ports/,,'`
|
t=`echo $p | sed 's,/usr/ports/,,'`
|
||||||
pn=`cd $p && make package-name`
|
pn=`cd $p && make package-name`
|
||||||
|
|
||||||
if pkg info $pn > /dev/null 2>&1 ; then
|
if [ "x$p" == "x/usr/ports/ports-mgmt/pkg" -o \
|
||||||
log_it "Already installed: $t ($pn)"
|
"x$p" == "x/freebsd/ports/ports-mgmt/pkg" ] ; then
|
||||||
|
log_it "Very Special: $t ($pn)"
|
||||||
|
|
||||||
|
(
|
||||||
|
cd $p
|
||||||
|
make clean ${PORTS_OPTS}
|
||||||
|
make all ${PORTS_OPTS}
|
||||||
|
make install ${PORTS_OPTS}
|
||||||
|
) > _.$b 2>&1 < /dev/null
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "x$p" == "x/usr/ports/ports-mgmt/pkg" ] ; then
|
if pkg info $pn > /dev/null 2>&1 ; then
|
||||||
log_it "Very Special: $t ($pn)"
|
log_it "Already installed: $t ($pn)"
|
||||||
(
|
|
||||||
cd $p
|
|
||||||
make clean all install ${PORTS_OPTS}
|
|
||||||
) > _.$b 2>&1 < /dev/null
|
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -380,7 +381,6 @@ done
|
|||||||
#######################################################################
|
#######################################################################
|
||||||
|
|
||||||
if [ "x$1" = "xchroot_script" ] ; then
|
if [ "x$1" = "xchroot_script" ] ; then
|
||||||
set +x
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
shift
|
shift
|
||||||
|
Loading…
x
Reference in New Issue
Block a user