X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=inline;f=id-rpm-build%2Fupload-rpms.sh;h=9450fbe750cae55b0e288ee3b10bb7fe419919de;hb=6e6bc76113aa5183986b671e7a79102c2f7cf31f;hp=0562b70fa02ef6abb79f7436b44ee474056fdd03;hpb=7d8c5ed8093a91ad072d3769d81b0dfb8ecb64ee;p=git-tools-moved-to-github.git diff --git a/id-rpm-build/upload-rpms.sh b/id-rpm-build/upload-rpms.sh index 0562b70..9450fbe 100755 --- a/id-rpm-build/upload-rpms.sh +++ b/id-rpm-build/upload-rpms.sh @@ -18,6 +18,8 @@ fi if test -z "$DISTRO"; then if grep 'release 6' /etc/redhat-release >/dev/null; then DISTRO="centos/6" + elif grep 'release 7' /etc/redhat-release > /dev/null; then + DISTRO="centos/7" else DISTRO="centos/5.5" fi @@ -42,15 +44,14 @@ if test ! -d ${BUILD_DIR}/RPMS; then fi for pkg in ${pkg_names}; do + copy=false if $inc_src; then - if test ! -f ${BUILD_DIR}/SRPMS/${pkg}.src.rpm; then - echo "FAILED: No SRPM for ${pkg}" - exit 1 + if test -f ${BUILD_DIR}/SRPMS/${pkg}.src.rpm; then + scp ${BUILD_DIR}/SRPMS/${pkg}.src.rpm ${UPLOAD_URI}/redhat/${DISTRO}/SRPMS/ + copy=true fi - scp ${BUILD_DIR}/SRPMS/${pkg}.src.rpm ${UPLOAD_URI}/redhat/${DISTRO}/SRPMS/ fi if $inc_bin; then - copy=false for dir in ${BUILD_DIR}/RPMS/*; do arch=`basename ${dir}` if test -f ${dir}/${pkg}.${arch}.rpm; then