[download] Remove directory we will unzip into, not subdir
This changes the download behavior for zips to always nuke the
directory the archive will unzip into before unzipping instead of
trying to delete a subdirectory of the target file. Since our zip
archives are downloaded into distinct subdirs, this ensures the
downloaded directory matches the archive contents (only) after an
update.
This mitigates some issues with the Go build that manipulate the
directory in //buildtools after downloading to make sure that the local
changes are nuked after updates.
Change-Id: I008c18af7013cce095511cbc4a6c889fa9561558
diff --git a/download.sh b/download.sh
index 5dd6d24..086f0a2 100644
--- a/download.sh
+++ b/download.sh
@@ -48,8 +48,9 @@
download_file_if_needed "${name}" "${base_url}" "${base_path}" ".zip"
if [[ -f "${zip_path}" ]]; then
+ rm -rf -- "${unzip_dir}"
mkdir -p -- "${unzip_dir}"
- (cd -- "${unzip_dir}" && rm -rf -- "${name}" && unzip -o -q "${zip_path}")
+ (cd -- "${unzip_dir}" && unzip -o -q "${zip_path}")
rm -f -- "${zip_path}"
fi
}
