diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-06-10 05:19:31 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-06-11 05:30:51 +0000 |
| commit | 47ec43ae6c61a23add12dc99b463650f1658ffc6 (patch) | |
| tree | 0a94d7df153bd1d26fd491c49076d82361d560ee /bin | |
| parent | Updating. (diff) | |
| download | progress-linux-tools-47ec43ae6c61a23add12dc99b463650f1658ffc6.tar.xz progress-linux-tools-47ec43ae6c61a23add12dc99b463650f1658ffc6.zip | |
Updating.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/pbuild.sh | 14 | ||||
| -rwxr-xr-x | bin/reprepro_fix-changes.sh | 7 |
2 files changed, 14 insertions, 7 deletions
diff --git a/bin/pbuild.sh b/bin/pbuild.sh index 4a3559c..9835141 100755 --- a/bin/pbuild.sh +++ b/bin/pbuild.sh @@ -247,9 +247,9 @@ do # upload case "${UPLOAD}" in true) - FILES="$(sed -e '1,/^Files:$/ d' ${TARGET}_${SOURCE_VERSION}*.dsc | grep -v '^\ \ ' | grep '^\ ' | awk '/^ / { print $3 }')" + FILES="$(sed -e '1,/^Files:$/ d' ${TARGET}_${SOURCE_VERSION}.dsc | grep -v '^\ \ ' | grep '^\ ' | awk '/^ / { print $3 }')" - for FILE in ${FILES} + for FILE in ${FILES} ${TARGET}_${SOURCE_VERSION}.dsc do rsync -aP "${FILE}" apt.progress-linux.org::upload rm -f "${FILE}" @@ -311,16 +311,16 @@ do cd "${SOURCE}" # disable tests - for TARGET in dh_auto_test dh_auto_test-arch dh_auto_test-indep \ + for RULE in dh_auto_test dh_auto_test-arch dh_auto_test-indep \ override_dh_auto_test override_dh_auto_test-arch override_dh_auto_test-indep \ execute_before_dh_auto_test execute_before_dh_auto_test-arch execute_before_dh_auto_test-indep \ execute_after_dh_auto_test execute_after_dh_auto_test-arch execute_after_dh_auto_test-indep do - if grep -qs "^${TARGET}:" debian/rules + if grep -qs "^${RULE}:" debian/rules then - sed -i -e "s|^${TARGET}:|disabled_${TARGET}:|" debian/rules + sed -i -e "s|^${RULE}:|disabled_${RULE}:|" debian/rules else - echo "${TARGET}:" >> debian/rules + echo "${RULE}:" >> debian/rules fi done @@ -360,7 +360,7 @@ do true) FILES="$(sed -e '1,/^Files:$/ d' ${TARGET}_${SOURCE_VERSION}_*.changes | grep -v '^\ \ ' | grep '^\ ' | awk '/^ / { print $5 }')" - for FILE in ${FILES} + for FILE in ${FILES} ${TARGET}_${SOURCE_VERSION}_*.changes do rsync -aP "${FILE}" apt.progress-linux.org::upload rm -f "${FILE}" diff --git a/bin/reprepro_fix-changes.sh b/bin/reprepro_fix-changes.sh index ae35550..cc89489 100755 --- a/bin/reprepro_fix-changes.sh +++ b/bin/reprepro_fix-changes.sh @@ -92,6 +92,13 @@ do mv "${BUILDINFO}".tmp "${BUILDINFO}" fi + DIRECTORY="$(basename ${BUILDINFO} | awk -F_ '{ print $1, $2 }' | sed -e 's| |-|' -e 's|~|_|g' -e 's|+|.|g')" + if ! grep -qs "Build-Path: /build/${DIRECTORY}|" "${BUILDINFO}" + then + echo "${CHANGES}: fix buildinfo build-path" + sed -i -e "s|Build-Path: .*|Build-Path: /build/${DIRECTORY}|" "${BUILDINFO}" + fi + if [ ! -e "${BUILDINFO}" ] then continue |