From 70a1c4019c2acd1351e94832999291be6fb068a0 Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Mon, 18 Jul 2016 16:37:41 +0200
Subject: [PATCH] Do not exit with fail status when trying to rm non-existing
files
---
captain.yml | 4 ++--
clean.sh | 6 +++---
src/docker/build/build-in-docker.sh | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/captain.yml b/captain.yml
index 05f503cac..f9c80a37e 100644
--- a/captain.yml
+++ b/captain.yml
@@ -17,8 +17,8 @@ portal-backend:
- cp -r $(pwd)/config/ $(pwd)/src/docker/run/config/
- cp -r $(pwd)/target/ $(pwd)/src/docker/run/target/
post:
- - rm -r $(pwd)/src/docker/run/target/
- - rm -r $(pwd)/src/docker/run/config/
+ - rm -rf $(pwd)/src/docker/run/target/
+ - rm -rf $(pwd)/src/docker/run/config/
- echo 'Finished building portal-backend'
test:
- tests.sh
\ No newline at end of file
diff --git a/clean.sh b/clean.sh
index 55a2f1aee..094693297 100755
--- a/clean.sh
+++ b/clean.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
./halt.sh
-sudo rm -r ./.m2/
-sudo rm -r ./target/
-sudo rm -r ./pgdata/
\ No newline at end of file
+sudo rm -rf ./.m2/
+sudo rm -rf ./target/
+sudo rm -rf ./pgdata/
\ No newline at end of file
diff --git a/src/docker/build/build-in-docker.sh b/src/docker/build/build-in-docker.sh
index 7b77f1e66..b0a5fb6a6 100644
--- a/src/docker/build/build-in-docker.sh
+++ b/src/docker/build/build-in-docker.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
echo 'Removing old target folder...'
-rm -r target/
+rm -rf target/
echo 'Packaging...'
mvn package
--
GitLab