manuel
/
void-packages
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-src: remove unnecessary variable assignments.

This commit is contained in:
Juan RP 2011-07-18 18:50:23 +02:00
parent e4ba462dc2
commit cfb09f2d9f
3 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
xbps-src/shutils/init_funcs.sh.in
View File

@ -29,27 +29,26 @@ set_defvars()
instsharedir=@@XBPS_INSTALL_SHAREDIR@@ instsharedir=@@XBPS_INSTALL_SHAREDIR@@
: ${XBPS_HELPERSDIR:=$instsharedir/helpers} XBPS_HELPERSDIR=$instsharedir/helpers
: ${XBPS_SHUTILSDIR:=$instsharedir/shutils} XBPS_SHUTILSDIR=$instsharedir/shutils
: ${XBPS_COMMONVARSDIR:=$instsharedir/common} XBPS_COMMONVARSDIR=$instsharedir/common
: ${XBPS_DBDIR:=$XBPS_MASTERDIR/var/db/xbps} XBPS_META_PATH=$XBPS_MASTERDIR/var/db/xbps
: ${XBPS_META_PATH:=$XBPS_DBDIR/} XBPS_PKGMETADIR=$XBPS_META_PATH/metadata
: ${XBPS_PKGMETADIR:=$XBPS_DBDIR/metadata} XBPS_SRCPKGDIR=$XBPS_DISTRIBUTIONDIR/srcpkgs
: ${XBPS_SRCPKGDIR:=$XBPS_DISTRIBUTIONDIR/srcpkgs}
if [ -n "$IN_CHROOT" ]; then if [ -n "$IN_CHROOT" ]; then
: ${XBPS_DESTDIR:=/destdir} XBPS_DESTDIR=/destdir
else else
: ${XBPS_DESTDIR:=$XBPS_MASTERDIR/destdir} XBPS_DESTDIR=$XBPS_MASTERDIR/destdir
fi fi
if [ -n "$XBPS_HOSTDIR" ]; then if [ -n "$XBPS_HOSTDIR" ]; then
: ${XBPS_PACKAGESDIR:=$XBPS_HOSTDIR/binpkgs} XBPS_PACKAGESDIR=$XBPS_HOSTDIR/binpkgs
: ${XBPS_SRCDISTDIR:=$XBPS_HOSTDIR/sources} XBPS_SRCDISTDIR=$XBPS_HOSTDIR/sources
else else
: ${XBPS_SRCDISTDIR:=$XBPS_MASTERDIR/host/sources} XBPS_SRCDISTDIR=$XBPS_MASTERDIR/host/sources
: ${XBPS_PACKAGESDIR:=$XBPS_MASTERDIR/host/binpkgs} XBPS_PACKAGESDIR=$XBPS_MASTERDIR/host/binpkgs
fi fi
: ${XBPS_BUILDDIR:=$XBPS_MASTERDIR/builddir} XBPS_BUILDDIR=$XBPS_MASTERDIR/builddir
: ${XBPS_TRIGGERSDIR:=$XBPS_SRCPKGDIR/xbps-triggers/files} XBPS_TRIGGERSDIR=$XBPS_SRCPKGDIR/xbps-triggers/files
DDIRS="TRIGGERSDIR HELPERSDIR SRCPKGDIR COMMONVARSDIR SHUTILSDIR" DDIRS="TRIGGERSDIR HELPERSDIR SRCPKGDIR COMMONVARSDIR SHUTILSDIR"
DDIRS="$DDIRS DISTRIBUTIONDIR" DDIRS="$DDIRS DISTRIBUTIONDIR"

2
xbps-src/shutils/metadata.sh
View File

@ -77,7 +77,7 @@ xbps_write_metadata_pkg()
# #
xbps_write_metadata_pkg_real() xbps_write_metadata_pkg_real()
{ {
local metadir=${DESTDIR}/var/db/xbps/metadata/$pkgname local metadir=${XBPS_PKGMETADIR}/$pkgname
local f i j found arch dirat lnkat newlnk lver TMPFLIST TMPFPLIST local f i j found arch dirat lnkat newlnk lver TMPFLIST TMPFPLIST
local fpattern="s|${DESTDIR}||g;s|^\./$||g;/^$/d" local fpattern="s|${DESTDIR}||g;s|^\./$||g;/^$/d"

14
xbps-src/xbps-src.sh.in
View File

@ -24,14 +24,14 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#- #-
: ${XBPS_CONFIG_FILE:=@@XBPS_INSTALL_ETCDIR@@/xbps-src.conf} XBPS_CONFIG_FILE=@@XBPS_INSTALL_ETCDIR@@/xbps-src.conf
: ${progname:=$(basename $0)} progname=$(basename $0)
: ${fakeroot_cmd:=/usr/bin/fakeroot} fakeroot_cmd=/usr/bin/fakeroot
: ${fakeroot_cmd_args:=--} fakeroot_cmd_args="--"
: ${sudo_cmd:=sudo} sudo_cmd=sudo
: ${chroot_cmd:=chroot} chroot_cmd=chroot
: ${xbps_machine:=$(uname -m)} xbps_machine=$(uname -m)
# Required utilities in host system. # Required utilities in host system.
REQHOST_UTILS="awk bash bison sed gcc msgfmt patch makeinfo \ REQHOST_UTILS="awk bash bison sed gcc msgfmt patch makeinfo \