pmodules/Pmodules
1
0
Fork 0
mirror of https://github.com/Pmodules/Pmodules.git synced 2026-06-28 02:19:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Pmodules/libpbuild.bash

Browse Source 
- bug in pbuild::cleanup() fixed
This commit is contained in:
gsell
2017-11-08 12:58:44 +01:00
parent 2242308298
commit 8f084de618
1 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pmodules/libpbuild.bash
+24 -15
View File
@@ -353,33 +353,41 @@ pbuild::install_doc() {
}
pbuild::cleanup_build() {
[[ "${MODULE_BUILDDIR}" == "${MODULE_SRCDIR}" ]] && return
[[ "${MODULE_BUILDDIR}" == "${MODULE_SRCDIR}" ]] && return 0
# the following two checks we should de earlier!
if [[ -z "${MODULE_BUILDDIR}" ]]; then
std::die 1 "Oops: internal error: %s is %s..." \
MODULE_BUILDDIR 'set to empty string'
fi
if [[ "${MODULE_BUILDDIR}" == "/" ]]; then
std::die 1 "Oops: internal error: %s is %s..." \
MODULE_BUILDDIR "set to '/'"
fi
if [[ ! -d "/${MODULE_BUILDDIR}" ]]; then
std::die 1 "Oops: internal error: %s is %s..." \
MODULE_BUILDDIR=${MODULE_BUILDDIR} "not a directory"
fi
echo "Cleaning up '/${MODULE_BUILDDIR}'..."
rm -rf "/${MODULE_BUILDDIR}"
{
cd "/${MODULE_BUILDDIR}/.."
if [[ "$(pwd)" == "/" ]]; then
std::die 1 "Oops: internal error: %s is %s..." \
MODULE_BUILDDIR "set to '/'"
fi
echo "Cleaning up '${MODULE_BUILDDIR}'..."
rm -rf "${MODULE_BUILDDIR##*/}"
};
return 0
}
pbuild::cleanup_src() {
(
[[ -d /${MODULE_SRCDIR} ]] || return 0
cd "/${MODULE_SRCDIR}/..";
if [[ $(pwd) != / ]]; then
echo "Cleaning up $(pwd)"
rm -rf ${MODULE_SRCDIR##*/}
fi
);
{
cd "/${MODULE_SRCDIR}/..";
if [[ $(pwd) == / ]]; then
std::die 1 "Oops: internal error: %s is %s..." \
MODULE_SRCDIR "set to '/'"
fi
echo "Cleaning up '${MODULE_SRCDIR}'..."
rm -rf "${MODULE_SRCDIR##*/}"
};
return 0
}
@@ -865,6 +873,7 @@ pbuild::make_all() {
[[ ${enable_cleanup_build} == yes ]] && pbuild::cleanup_build
[[ ${enable_cleanup_src} == yes ]] && pbuild::cleanup_src
return 0
}
##############################################################################