OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-tools Date: 12-Oct-2005 21:24:26
Branch: HEAD Handle: 2005101220242600
Modified files:
openpkg-tools/cmd dev.sh
Log:
consolidate .src.sh handling for openpkg package with usual .src.rpm
handling using a loop
Summary:
Revision Changes Path
1.68 +17 -22 openpkg-tools/cmd/dev.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
============================================================================
$ cvs diff -u -r1.67 -r1.68 dev.sh
--- openpkg-tools/cmd/dev.sh 12 Oct 2005 19:22:31 -0000 1.67
+++ openpkg-tools/cmd/dev.sh 12 Oct 2005 19:24:26 -0000 1.68
@@ -1720,32 +1720,27 @@
fi
fi
- area=`echo ${OPENPKG_DIST}/${upload} | sed -e 's;[EMAIL
PROTECTED]:/;OpenPKG ;'`
- echo "++ releasing ${rpmfile}.${ext} to distribution area
${area}"
- if [ ${bundle} -eq 1 ]; then
- bundle_srpms="${bundle_srpms}
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}"
- elif [ ${dry} -eq 0 ]; then
- chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
- scp -o "Compression no" -o "Cipher blowfish"
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext} ${OPENPKG_DIST}/${upload}
- else
- echo chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
- echo "scp -o \"Compression no\" -o \"Cipher blowfish\"
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext} ${OPENPKG_DIST}/${upload}/"
- fi
-
+ area=`echo ${OPENPKG_DIST}/${upload}/ | sed -e 's;[EMAIL
PROTECTED]:/;OpenPKG ;'`
+ dist=`echo ${OPENPKG_DIST} | sed -e 's;^.*:;;'`
+ exts="${ext}"
if [ ".${name}" = .openpkg ]; then
- if [ -f "${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh" ]; then
- echo "++ releasing ${rpmfile}.src.sh to OpenPKG
distribution area ${upload}"
- if [ ${dry} -eq 0 ]; then
- chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh
- scp -o "Compression no" -o "Cipher blowfish"
${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh ${OPENPKG_DIST}/${upload}
- else
- echo chmod 664
${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh
- echo "scp -o \"Compression no\" -o \"Cipher
blowfish\" ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh ${OPENPKG_DIST}/${upload}/"
- fi
- else
+ if [ ! -f "${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh" ]; then
die "required file
${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh missing"
fi
+ exts="${exts} src.sh"
fi
+ for ext in $exts; do
+ echo "++ releasing ${rpmfile}.${ext} to distribution area
${area}"
+ if [ ${bundle} -eq 1 ]; then
+ bundle_srpms="${bundle_srpms}
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}"
+ elif [ ${dry} -eq 0 ]; then
+ chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
+ scp -o "Compression no" -o "Cipher blowfish"
"${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}" "${OPENPKG_DIST}/${upload}/"
+ else
+ echo "chmod 664
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}"
+ echo "scp -o \"Compression no\" -o \"Cipher blowfish\"
\"${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}\" \"${OPENPKG_DIST}/${upload}/\""
+ fi
+ done
echo "++ determining commit message"
if [ ".$msg" = . ]; then
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
