From bb32e8845d4aee263a22c61ca432478279aec62b Mon Sep 17 00:00:00 2001
From: Jules Villard <jul@fb.com>
Date: Mon, 27 Feb 2017 03:23:16 -0800
Subject: [PATCH] various fixes to the release script

Reviewed By: jberdine

Differential Revision: D4605160

fbshipit-source-id: 85f8c5c
---
 scripts/package_infer_source_with_clang_binaries.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/scripts/package_infer_source_with_clang_binaries.sh b/scripts/package_infer_source_with_clang_binaries.sh
index 27d0a8854..78de9b690 100755
--- a/scripts/package_infer_source_with_clang_binaries.sh
+++ b/scripts/package_infer_source_with_clang_binaries.sh
@@ -22,10 +22,13 @@ INFER_SOURCE="$ROOT_INFER_DIR"/infer-source
 cd "$ROOT_INFER_DIR"
 # This assumes the current commit is the one with the release bump
 ./build-infer.sh
+find "$CLANG_PREFIX"/{bin,lib} -type f -print0 | xargs -0 strip -x || true
 
 # Get a copy of the github repo
-git clone https://github.com/facebook/infer.git "$INFER_SOURCE" || \
-  git -C "$INFER_SOURCE" fetch origin master
+if ! git -C "$INFER_SOURCE" status > /dev/null; then
+  git clone https://github.com/facebook/infer.git "$INFER_SOURCE"
+fi
+git -C "$INFER_SOURCE" fetch origin master
 pushd "$INFER_SOURCE"
 # Name of the release package
 VERSION=`git describe --abbrev=0 --tags`
@@ -41,9 +44,11 @@ PKG_CLANG_PREFIX="$PKG_PLUGIN_DIR"/clang/install
 
 git checkout "$VERSION"
 git submodule update --init
+git clean -xfd
 popd
 
 # Copy infer source
+rm -fr "$PKG_DIR"
 mkdir -p "$PKG_DIR"
 rsync -a \
   --exclude="**/.git" \
@@ -78,6 +83,3 @@ if grep -Ir "$FBDASHONLY" "$PKG_DIR"; then
 fi
 
 cd "$ROOT_INFER_DIR" && tar cJf "$RELEASE_TARBALL" "$RELEASE_NAME"
-
-# Cleanup.
-rm -rf "$PKG_DIR" "$INFER_SOURCE"