Project

General

Profile

« Previous | Next » 

Revision 87925fd1

Added by Renato Botelho almost 10 years ago

Simplify logic and check if file exist before try to copy it

View differences:

tools/builder_common.sh
2064 2064
}
2065 2065

  
2066 2066
snapshots_copy_to_staging_iso_updates() {
2067
	# Copy ISOs
2068
	md5 ${ISOPATH}.gz > ${ISOPATH}.md5
2069
	sha256 ${ISOPATH}.gz > ${ISOPATH}.sha256
2070
	cp ${ISOPATH}* $STAGINGAREA/ 2>/dev/null
2071
	snapshots_create_latest_symlink ${STAGINGAREA}/$(basename ${ISOPATH})
2072

  
2073
	# Copy memstick items
2074
	md5 ${MEMSTICKPATH}.gz > ${MEMSTICKPATH}.md5
2075
	sha256 ${MEMSTICKPATH}.gz > ${MEMSTICKPATH}.sha256
2076
	cp ${MEMSTICKPATH}* $STAGINGAREA/ 2>/dev/null
2077
	snapshots_create_latest_symlink ${STAGINGAREA}/$(basename ${MEMSTICKPATH})
2078

  
2079
	md5 ${MEMSTICKSERIALPATH}.gz > ${MEMSTICKSERIALPATH}.md5
2080
	sha256 ${MEMSTICKSERIALPATH}.gz > ${MEMSTICKSERIALPATH}.sha256
2081
	cp ${MEMSTICKSERIALPATH}* $STAGINGAREA/ 2>/dev/null
2082
	snapshots_create_latest_symlink ${STAGINGAREA}/$(basename ${MEMSTICKSERIALPATH})
2067
	local _img=""
2083 2068

  
2084
	if [ "${TARGET}" = "amd64" ]; then
2069
	for _img in ${ISOPATH} ${MEMSTICKPATH} ${MEMSTICKSERIALPATH} ${UPDATES_TARBALL_FILENAME}; do
2070
		if [ ! -f "${_img}.gz" ]; then
2071
			continue
2072
		fi
2073
		md5 ${_img}.gz > ${_img}.md5
2074
		sha256 ${_img}.gz > ${_img}.sha256
2075
		cp ${_img}* $STAGINGAREA/ 2>/dev/null
2076
		snapshots_create_latest_symlink ${STAGINGAREA}/$(basename ${_img})
2077
	done
2078

  
2079
	if [ "${TARGET}" = "amd64" -a -f "${MEMSTICKADIPATH}.gz" ]; then
2085 2080
		md5 ${MEMSTICKADIPATH}.gz > ${MEMSTICKADIPATH}.md5
2086 2081
		sha256 ${MEMSTICKADIPATH}.gz > ${MEMSTICKADIPATH}.sha256
2087 2082
		cp ${MEMSTICKADIPATH}* $STAGINGAREA/ 2>/dev/null
2088 2083
		snapshots_create_latest_symlink ${STAGINGAREA}/$(basename ${MEMSTICKADIPATH})
2089 2084
	fi
2090 2085

  
2091
	md5 ${UPDATES_TARBALL_FILENAME} > ${UPDATES_TARBALL_FILENAME}.md5
2092
	sha256 ${UPDATES_TARBALL_FILENAME} > ${UPDATES_TARBALL_FILENAME}.sha256
2093
	cp ${UPDATES_TARBALL_FILENAME}* $STAGINGAREA/ 2>/dev/null
2094
	snapshots_create_latest_symlink ${STAGINGAREA}/$(basename ${UPDATES_TARBALL_FILENAME})
2095

  
2096 2086
	# NOTE: Updates need a file with output similar to date output
2097 2087
	# Use the file generated at start of snapshots_dobuilds() to be consistent on times
2098 2088
	if [ -z "${_IS_RELEASE}" ]; then

Also available in: Unified diff