diff options
| -rwxr-xr-x | bin/builder/build-clean | 14 | ||||
| -rwxr-xr-x | bin/builder/build-sync | 20 |
2 files changed, 21 insertions, 13 deletions
diff --git a/bin/builder/build-clean b/bin/builder/build-clean index 3a4b26f..fd6866a 100755 --- a/bin/builder/build-clean +++ b/bin/builder/build-clean @@ -3,16 +3,12 @@ echo "cleaning: ${1}" import "${1}" -for file in .synced .compiled .installed; do - [ -f "${L}/${file}" ] && rm -f "${L}/${file}" +for dir in "${L}" "${S}" "${D}"; do + if [ -d "${dir}" ]; then + rm -rf "${dir}" & + fi done -if [ -d "${BUILDER_PKGDIR}/${NAME}/build" ]; then - rm -rf "${BUILDER_PKGDIR}/${NAME}/build" -fi - -if [ -d "${BUILDER_PKGDIR}/${NAME}/install" ]; then - rm -rf "${BUILDER_PKGDIR}/${NAME}/install" -fi +wait # vim: filetype=sh diff --git a/bin/builder/build-sync b/bin/builder/build-sync index 4a0ea3e..0627ace 100755 --- a/bin/builder/build-sync +++ b/bin/builder/build-sync @@ -66,14 +66,26 @@ build_sync_http() fi } -[ -d "${D}" ] || mkdir -p "${D}" -[ -d "${S}" ] || mkdir -p "${S}" -[ -d "${L}" ] || mkdir -p "${L}" +if [ ! -d "${L}" ]; then + mkdir -p "${L}" +fi + if [ -f "${L}/sync.log" ]; then - rm "${L}/sync.log" || exit 1 + rm "${L}/sync.log" fi touch "${L}/sync.log" +for dir in "${D}" "${S}"; do + if [ -d "${dir}" ]; then + echo "${NAME}: prepping '${dir}' for sync" >> "${L}/sync.log" + mv "${dir}" "${dir}.old" + rm -rf "${dir}.old" & + fi + mkdir -p "${dir}" +done + +wait + if [ -d "${BUILDER_PKGDIR}/${NAME}/source" ]; then if [ "$(command -v rsync)" ]; then if ! rsync -rav --delete "${BUILDER_PKGDIR}/${NAME}/source/" "${S}"; then |