Skip to content

Commit

Permalink
Revert "beesh.sh: use pbzip2 for saving build environment when availa…
Browse files Browse the repository at this point in the history
…ble"

This reverts commit 034ce8c.

It's clearer to start all over :)
  • Loading branch information
thomas committed Aug 20, 2018
1 parent 034ce8c commit 4769f95
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions src/beesh.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ function bee_archivebuild() {
mkdir -pv "${BEE_BUILDARCHIVEDIR}"
fi

archive="${BEE_BUILDARCHIVEDIR}/${PKGALLPKG}.beebuild.tar"
archive="${BEE_BUILDARCHIVEDIR}/${PKGALLPKG}.beebuild.tar.bz2"

print_info " -> saving build environment.."
print_info "${COLOR_CYAN}${archive}"
Expand All @@ -683,7 +683,7 @@ function bee_archivebuild() {
B=${BEEWORKDIR}/build
fi

tar -cf ${archive} \
tar -cjf ${archive} \
--show-transformed-names \
--sparse \
--absolute-names \
Expand All @@ -693,16 +693,6 @@ function bee_archivebuild() {
--transform="s,^${BEEWORKDIR},${PKGALLPKG}," \
--transform="s,^${F},${PKGALLPKG}/files," \
--transform="s,^${BEE_BEEDIR},${PKGALLPKG}/files,"

BZIP2=bzip2

if type -p pbzip2 > /dev/null ; then
BZIP2=pbzip2
fi

$BZIP2 ${archive}
archive="${archive}.bz2" # add bz2 for correct bookkeeping

}

function load_buildmagic() {
Expand Down

0 comments on commit 4769f95

Please sign in to comment.