Author: biurrun Date: Tue Sep 29 14:08:52 2009 New Revision: 997 Log: Use 'rsync' instead of 'cp' to transfer files to the OpenWrt checkout. This makes the configuration script idempotent. Modified: trunk/openwrt/trunk/configure_router.sh Modified: trunk/openwrt/trunk/configure_router.sh ============================================================================== --- trunk/openwrt/trunk/configure_router.sh Tue Sep 29 13:40:28 2009 (r996) +++ trunk/openwrt/trunk/configure_router.sh Tue Sep 29 14:08:52 2009 (r997) @@ -62,18 +62,18 @@ OPENWRT_VERSION="SVN r$(svn info ${OPENWRT_PATH} | grep Revision: | cut -d' ' -f2)" mkdir -p "${OPENWRT_PATH}/files" -cp -Lr "${PISA_OPENWRT_PATH}/${ROUTER_NAME}/etc" "${OPENWRT_PATH}/files" +rsync -Lr --delete --exclude=.svn "${PISA_OPENWRT_PATH}/${ROUTER_NAME}/etc" "${OPENWRT_PATH}/files" sed -i -e "s/| PISA version: Subversion HEAD |/| PISA version: $PISA_VERSION |/" "${OPENWRT_PATH}/files/etc/banner" sed -i -e "s/| OpenWrt version: 8.09.1 |/| OpenWrt version: $OPENWRT_VERSION |/" "${OPENWRT_PATH}/files/etc/banner" mkdir -p "${OPENWRT_PATH}/dl" -cp ${PISA_PATH}/pisa*.tar.gz ${OPENWRT_PATH}/dl -cp ${HIPL_PATH}/hipl*.tar.gz ${OPENWRT_PATH}/dl +rsync ${PISA_PATH}/pisa*.tar.gz ${OPENWRT_PATH}/dl +rsync ${HIPL_PATH}/hipl*.tar.gz ${OPENWRT_PATH}/dl -cp -r "${PISA_OPENWRT_PATH}/package/hipl" "${OPENWRT_PATH}/package/" -cp -r "${PISA_OPENWRT_PATH}/package/pisa" "${OPENWRT_PATH}/package/" -cp -r "${PISA_OPENWRT_PATH}/package/libxml2" "${OPENWRT_PATH}/package/" +rsync -Lr --delete --exclude=.svn "${PISA_OPENWRT_PATH}/package/hipl" "${OPENWRT_PATH}/package/" +rsync -Lr --delete --exclude=.svn "${PISA_OPENWRT_PATH}/package/pisa" "${OPENWRT_PATH}/package/" +rsync -Lr --delete --exclude=.svn "${PISA_OPENWRT_PATH}/package/libxml2" "${OPENWRT_PATH}/package/" sed -i -e "s/PKG_VERSION:=.*/PKG_VERSION:=$PISA_VERSION/" "${OPENWRT_PATH}/package/pisa/Makefile"