xbps-src: apply indentation and avoid XBPS_MASTERDIR in the chroot case.
This commit is contained in:
parent
b9f2cbed05
commit
cf97b1a2b4
1 changed files with 383 additions and 373 deletions
12
xbps-src
12
xbps-src
|
@ -94,6 +94,7 @@ Targets: (only one may be specified)
|
|||
Removes a masterdir but preserving ccache, distcc and host directories.
|
||||
|
||||
Options:
|
||||
|
||||
-a <profile>
|
||||
Cross compile packages for this profile. Supported values:
|
||||
|
||||
|
@ -383,6 +384,15 @@ if [ -n "$IN_CHROOT" ]; then
|
|||
readonly XBPS_RINDEX_CMD="xbps-rindex"
|
||||
readonly XBPS_RECONFIGURE_CMD="xbps-reconfigure"
|
||||
readonly XBPS_REMOVE_CMD="xbps-remove"
|
||||
readonly XBPS_SRCPKGDIR=/xbps-packages/srcpkgs
|
||||
readonly XBPS_COMMONDIR=/xbps-packages/common
|
||||
readonly XBPS_DESTDIR=/destdir
|
||||
readonly XBPS_BUILDDIR=/builddir
|
||||
readonly XBPS_SHUTILSDIR=$XBPS_COMMONDIR/xbps-src/shutils
|
||||
readonly XBPS_TRIGGERSDIR=$XBPS_SRCPKGDIR/xbps-triggers/files
|
||||
readonly XBPS_CROSSPFDIR=$XBPS_COMMONDIR/cross-profiles
|
||||
readonly XBPS_BUILDSTYLEDIR=$XBPS_COMMONDIR/build_style
|
||||
readonly XBPS_LIBEXECDIR=$XBPS_COMMONDIR/xbps-src/libexec
|
||||
else
|
||||
readonly XBPS_UHELPER_CMD="xbps-uhelper -r $XBPS_MASTERDIR"
|
||||
readonly XBPS_INSTALL_CMD="xbps-install -C _empty.conf_ --repository=$XBPS_REPOSITORY -r $XBPS_MASTERDIR"
|
||||
|
@ -390,7 +400,6 @@ else
|
|||
readonly XBPS_RINDEX_CMD="xbps-rindex"
|
||||
readonly XBPS_RECONFIGURE_CMD="xbps-reconfigure -r $XBPS_MASTERDIR"
|
||||
readonly XBPS_REMOVE_CMD="xbps-remove -r $XBPS_MASTERDIR"
|
||||
fi
|
||||
readonly XBPS_SRCPKGDIR=$XBPS_DISTDIR/srcpkgs
|
||||
readonly XBPS_COMMONDIR=$XBPS_DISTDIR/common
|
||||
readonly XBPS_SHUTILSDIR=$XBPS_COMMONDIR/xbps-src/shutils
|
||||
|
@ -400,6 +409,7 @@ readonly XBPS_TRIGGERSDIR=$XBPS_SRCPKGDIR/xbps-triggers/files
|
|||
readonly XBPS_CROSSPFDIR=$XBPS_COMMONDIR/cross-profiles
|
||||
readonly XBPS_BUILDSTYLEDIR=$XBPS_COMMONDIR/build_style
|
||||
readonly XBPS_LIBEXECDIR=$XBPS_COMMONDIR/xbps-src/libexec
|
||||
fi
|
||||
readonly CHROOT_CMD=xbps-uchroot
|
||||
|
||||
# XBPS_FETCH_CMD can be overriden
|
||||
|
|
Loading…
Reference in a new issue