diff options
Diffstat (limited to '')
| -rwxr-xr-x | bin/pmove.sh | 72 |
1 files changed, 43 insertions, 29 deletions
diff --git a/bin/pmove.sh b/bin/pmove.sh index d831b90..1656aa3 100755 --- a/bin/pmove.sh +++ b/bin/pmove.sh @@ -28,6 +28,25 @@ do for CHANGE in ${CHANGES} do + FILES="$(sed -e '1,/^Files:$/ d' ${CHANGE} | grep -v '^\ \ ' | grep '^\ ' | awk '/^ / { print $5 }')" + + CONTINUE="false" + for FILE in ${FILES} + do + if [ ! -e "${UPLOAD}/${FILE}" ] + then + CONTINUE="true" + break + fi + done + + case "${CONTINUE}" in + true) + echo "$(basename ${CHANGE}): incomplete upload, ${FILE} is missing." + continue + ;; + esac + PACKAGE="$(basename ${CHANGE} .changes | awk -F_ '{ print $1 }')" if [ "$(basename ${PWD})" != "${PACKAGE}" ] @@ -47,20 +66,9 @@ do cd "${VERSION}_${ARCHITECTURE}" - FILES="$(sed -e '1,/^Files:$/ d' ${CHANGE} | grep -v '^\ \ ' | grep '^\ ' | awk '/^ / { print $5 }')" - - for FILE in ${FILES} - do - if [ ! -e "${FILE}" ] - then - echo "incomplete upload: ${CHANGE}, skipping" - continue - fi - done - - for FILE in ${FILES} + for FILE in ${FILES} ${CHANGE} do - mv "${UPLOAD}/${FILE}" . + mv "${UPLOAD}/$(basename ${FILE})" . done if ls *_${ARCHITECTURE}.buildinfo > /dev/null 2>&1 @@ -70,7 +78,7 @@ do -e 's|^ LANG="en_US.UTF-8"| LANG="C.UTF-8"|' \ *_${ARCHITECTURE}.buildinfo fi - mv ${CHANGE} . + reprepro_fix-changes.sh *_${ARCHITECTURE}.changes case "${MODE}" in @@ -102,6 +110,25 @@ then break fi + FILES="$(sed -e '1,/^Files:$/ d' ${DSC} | grep -v '^\ \ ' | grep '^\ ' | awk '/^ / { print $3 }')" + + CONTINUE="false" + for FILE in ${FILES} + do + if [ ! -e "${UPLOAD}/${FILE}" ] + then + CONTINUE="true" + break + fi + done + + case "${CONTINUE}" in + true) + echo "$(basename ${DSC}): incomplete upload, ${FILE} is missing." + continue + ;; + esac + PACKAGE="$(basename ${DSC} .dsc | awk -F_ '{ print $1 }')" if [ "$(basename ${PWD})" != "${PACKAGE}" ] @@ -120,20 +147,9 @@ then mkdir "${VERSION}_source" cd "${VERSION}_source" - FILES="$(sed -e '1,/^Files:$/ d' ${DSC} | grep -v '^\ \ ' | grep '^\ ' | awk '/^ / { print $3 }')" - - for FILE in ${FILES} - do - if [ ! -e "${FILE}" ] - then - echo "incomplete upload: ${DSC}, skipping" - continue - fi - done - - for FILE in ${FILES} + for FILE in ${FILES} ${DSC} do - mv "${UPLOAD}/${FILE}" . + mv "${UPLOAD}/$(basename ${FILE})" . if [ -e ../orig/${FILE} ] then @@ -141,8 +157,6 @@ then fi done - mv ${DSC} . - case "${MODE}" in progress-linux) psign.sh |