From 83bb39a12d0862402e8e16f2fe5e5693e946f041 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Fri, 27 Jan 2017 13:21:28 +0530
Subject: [PATCH] moved `app_present` inside `bootstrap_express_app`

---
 bitnami/express/rootfs/app-entrypoint.sh           |  4 +---
 .../express/rootfs/opt/bitnami/express/functions   | 14 +++++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/bitnami/express/rootfs/app-entrypoint.sh b/bitnami/express/rootfs/app-entrypoint.sh
index 8a2076315ada..f65fa202a0d7 100755
--- a/bitnami/express/rootfs/app-entrypoint.sh
+++ b/bitnami/express/rootfs/app-entrypoint.sh
@@ -2,9 +2,7 @@
 . /opt/bitnami/express/functions
 
 if [ "$1" == npm ] && [ "$2" == "start" -o "$2" == "run" ]; then
-  if ! app_present; then
-    bootstrap_express_app
-  fi
+  bootstrap_express_app
 
   add_dockerfile
 
diff --git a/bitnami/express/rootfs/opt/bitnami/express/functions b/bitnami/express/rootfs/opt/bitnami/express/functions
index 58d4bf6de8e7..ab2e31e80663 100644
--- a/bitnami/express/rootfs/opt/bitnami/express/functions
+++ b/bitnami/express/rootfs/opt/bitnami/express/functions
@@ -98,12 +98,16 @@ add_nodemon_support() {
 }
 
 bootstrap_express_app() {
-  log "Creating express application"
-  express . -f
+  if ! app_present; then
+    log "Creating express application."
+    express . -f
 
-  add_database_support
-  add_nodemon_support
-  add_sample_code
+    add_database_support
+    add_nodemon_support
+    add_sample_code
+  else
+    log "Skipping creation of new application. Already exists!"
+  fi
 }
 
 add_dockerfile() {