moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-src: improve msg_* funcs and update all callers.

Browse source
This commit is contained in:
Juan RP 2010-12-20 00:22:12 +01:00
parent 24c7ac6808
commit 3da3783333
27 changed files with 184 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

12
xbps-src/shutils/chroot.sh.in
View file

@ -47,7 +47,7 @@ if [ $? -ne 0 ]; then
exit 1
fi
msg_normal "Entering into the chroot on $XBPS_MASTERDIR."
msg_normal "Entering into the chroot on $XBPS_MASTERDIR.\n"
if [ ! -d $XBPS_MASTERDIR/usr/local/etc ]; then
mkdir -p $XBPS_MASTERDIR/usr/local/etc
@ -77,7 +77,7 @@ if [ -n "$XBPS_COMPRESS_LEVEL" ]; then
fi
echo "# End of configuration file." >> $XBPSSRC_CF
msg_normal "Cleaning up /tmp..."
msg_normal "Cleaning up /tmp...\n"
if [ -d $XBPS_MASTERDIR/tmp ]; then
rm -rf $XBPS_MASTERDIR/tmp/*
fi
@ -166,7 +166,7 @@ prepare_binpkg_repos()
if [ ! -f ${XBPS_PACKAGESDIR}/${xbps_machine}/pkg-index.plist ]; then
:
else
msg_normal "Registering local repository..."
msg_normal "Registering local repository...\n"
${chroot_cmd} $XBPS_MASTERDIR \
${XBPS_REPO_CMD} add /xbps_packagesdir 2>/dev/null
[ $? -eq 0 ] && touch -f \
@ -176,7 +176,7 @@ prepare_binpkg_repos()
for repo in ${XBPS_REPO_LIST}; do
${chroot_cmd} ${XBPS_MASTERDIR} ${XBPS_REPO_CMD} \
add ${repo} 2>/dev/null
[ $? -ne 0 ] && msg_warn "Failed to sync pkg-index from ${repo}"
[ $? -ne 0 ] && msg_warn "Failed to sync pkg-index from ${repo}\n"
done
}
@ -268,7 +268,7 @@ xbps_chroot_handler()
fi
# Reinstall xbps-src in the chroot
msg_normal "Installing xbps-src in the masterdir..."
msg_normal "Installing xbps-src in the masterdir...\n"
env in_chroot=yes LANG=C PATH=$path \
${chroot_cmd} $XBPS_MASTERDIR sh -c \
"cd /xbps/xbps-src && make IN_CHROOT=1 install clean" \
@ -290,7 +290,7 @@ xbps_chroot_handler()
fi
rm -f ${XBPS_MASTERDIR}/.xbps_chroot_working
msg_normal "Exiting from the chroot on $XBPS_MASTERDIR."
msg_normal "Exiting from the chroot on $XBPS_MASTERDIR.\n"
return $rv
}