From 6aee0487866af82efb3f6f3ce0fa11953a039dbf Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Wed, 20 Jul 2016 12:45:03 +0200
Subject: [PATCH] Tune the package generator

---
 generate-all.sh | 4 ++++
 generate.sh     | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/generate-all.sh b/generate-all.sh
index 1e190c3..2b15efa 100755
--- a/generate-all.sh
+++ b/generate-all.sh
@@ -2,4 +2,8 @@ ENVIRONMENT=one PACKAGE_TYPE=deb ./generate.sh
 ENVIRONMENT=one PACKAGE_TYPE=rpm ./generate.sh
 ENVIRONMENT=ec2 PACKAGE_TYPE=deb ./generate.sh
 ENVIRONMENT=ec2 PACKAGE_TYPE=rpm ./generate.sh
+
+echo
+echo "The packages are here:"
+echo "--------------------------------------------------------------------------------"
 find out -type f
diff --git a/generate.sh b/generate.sh
index f0cb4d8..6a209ae 100755
--- a/generate.sh
+++ b/generate.sh
@@ -54,7 +54,8 @@ URL=${URL:-http://opennebula.org}
 
 SCRIPTS_DIR=$PWD
 NAME="${PACKAGE_NAME}_${VERSION}.${PACKAGE_TYPE}"
-rm $NAME
+
+rm -f $NAME
 
 rm -rf tmp
 mkdir tmp
@@ -78,8 +79,8 @@ fi
 
 cd tmp
 
-rm -rf "$SCRIPTS_DIR/out"
 mkdir -p "$SCRIPTS_DIR/out"
+rm -f "$SCRIPTS_DIR/out/$NAME"
 
 fpm -n "$PACKAGE_NAME" -t "$PACKAGE_TYPE" $PKGARGS -s dir --vendor "$VENDOR" \
     --license "$LICENSE" --description "$DESCRIPTION" --url "$URL" \