commit e4ac6165e87c68519805fc8b93f816f5fb7be1e9
author iirina <elenairina@google.com> Mon Apr 08 01:37:20 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Apr 08 01:39:08 2019 -0700
tree 044eebe7a58ef61211ad50d0e4b76cae8a865818
parent 95d94fa1ebb5e173668f66fc24be10c24ea7dd45

Add singlejar to the java tools zip.

Closes #7951.

PiperOrigin-RevId: 242421452

src/merge_zip_files.sh

diff --git a/src/merge_zip_files.sh b/src/merge_zip_files.sh
index 9907bca..c148a9a 100755
--- a/src/merge_zip_files.sh
+++ b/src/merge_zip_files.sh
@@ -56,7 +56,7 @@
 if [[ "$directory_prefix" == "-" ]]; then
   for curr_zip in "$@"
   do
-    unzip -q "$curr_zip" -d "$tmp_dir"
+    unzip -q -o "$curr_zip" -d "$tmp_dir"
   done
 
   cd "$tmp_dir"
@@ -65,7 +65,7 @@
   mkdir -p "$tmp_dir/$directory_prefix"
   for curr_zip in "$@"
   do
-    unzip -q "$curr_zip" -d "$tmp_dir/$directory_prefix"
+    unzip -q -o "$curr_zip" -d "$tmp_dir/$directory_prefix"
   done
 
   cd "$tmp_dir"