diff options
Diffstat (limited to 'package.sh')
| -rwxr-xr-x | package.sh | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/package.sh b/package.sh index 25db5b39b..24ccad70d 100755 --- a/package.sh +++ b/package.sh @@ -11,7 +11,6 @@ export PKG_MAKE=$0 export PKG_NAME=${1%_} export PKG_BASE=$(realpath "$(dirname "$0")") -source "${PKG_BASE}/helper.sh" # when running fakeroot, we shouldn't use the previous build result # as we don't have the fakeroot session info anymore @@ -22,6 +21,8 @@ else ./remake.sh "${PKG_NAME}" fi +source "${PKG_BASE}/helper.sh" + pkg: mkdir -p /DEBIAN ./control.sh "${PKG_NAME}" control >"$(pkg_ /DEBIAN/control)" @@ -44,19 +45,23 @@ fi export PKG_HASH=$(util/catdir.sh "${PKG_DEST}" | md5sum | cut -d ' ' -f 1) echo "hashed dest ${PKG_NAME} to: ${PKG_HASH}" +NEED_PACK=0 -if [[ -e "${PKG_STAT}/dest-md5" && ${PKG_HASH} == $(cat "${PKG_STAT}/dest-md5" 2>/dev/null) ]]; then - echo "skipping re-package of ${PKG_NAME}" -else +if [[ -z ${PKG_RVSN} || ! -e "${PKG_STAT}/dest-md5" || ${PKG_HASH} != $(cat "${PKG_STAT}/dest-md5" 2>/dev/null) ]]; then if [[ -z ${PKG_RVSN} ]]; then PKG_RVSN=1 else PKG_RVSN=$((${PKG_RVSN} + 1)) fi - - if [[ ! -d "${PKG_BASE}/debs/${PKG_CFTARG}" ]]; then - mkdir -p "${PKG_BASE}/debs/${PKG_CFTARG}" - fi + NEED_PACK=1 +fi +export PKG_PACK=${PKG_BASE}/debs/${PKG_CFTARG}/${PKG_NAME}_${PKG_VRSN}-${PKG_RVSN}_${PKG_ARCH}.deb +if [[ ${NEED_PACK} == 0 && -f "${PKG_PACK}" ]]; then + echo "skipping re-package of ${PKG_NAME}" +else + if [[ ! -d "${PKG_BASE}/debs/${PKG_CFTARG}" ]]; then + mkdir -p "${PKG_BASE}/debs/${PKG_CFTARG}" + fi export PKG_PACK=${PKG_BASE}/debs/${PKG_CFTARG}/${PKG_NAME}_${PKG_VRSN}-${PKG_RVSN}_${PKG_ARCH}.deb if [[ -e ${PKG_PACK} ]]; then echo "package ${PKG_PACK} already exists..." |