Skip to content

Commit

Permalink
beesh: remove unused and deprecated variables R and W
Browse files Browse the repository at this point in the history
use BEEWORKDIR instead of W
and BEEPKGROOT instead of R
  • Loading branch information
mariux committed Mar 27, 2013
1 parent 7807570 commit e39b178
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions src/beesh.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -211,12 +211,12 @@ function bee_init_builddir() {

print_info "==> initializing build environment .."

if [ -d "${W}" ] ; then
if [ -d "${BEEWORKDIR}" ] ; then
if [ "${OPT_CLEANUP}" = "yes" ] ; then
print_info " -> cleaning work dir ${W} .."
rm -fr ${W}
print_info " -> cleaning work dir ${BEEWORKDIR} .."
rm -fr ${BEEWORKDIR}
else
print_error "error initializing build-dir ${W}"
print_error "error initializing build-dir ${BEEWORKDIR}"
print_error "please use -c to force a cleanup."
exit 1
fi
Expand All @@ -233,7 +233,7 @@ function bee_init_buildinsourcedir() {
if [ "${B}" == "${S}" ] ; then
link=${BEEWORKDIR}/build
print_info " -> B=S linking build dir ${link} to source dir"
ln -s ${S#${W}/} ${link}
ln -s ${S#${BEEWORKDIR}/} ${link}
else
print_info " -> creating build dir ${B}"
mkdir -p ${B}
Expand Down Expand Up @@ -954,9 +954,6 @@ PV=( ${PKGVERSION[@]} )
BEEPKGROOT="${BEE_TMP_BUILDROOT}/${PKGNAME}"
BEEWORKDIR="${BEEPKGROOT}/${PKGFULLPKG}"

R=${BEEPKGROOT}
W=${BEEWORKDIR}

F=${BEEPKGROOT}/files
S=${BEEWORKDIR}/source
B=${BEEWORKDIR}/build
Expand Down

0 comments on commit e39b178

Please sign in to comment.