From b985c616d04fd51e2e69c2c0c6b7b2799cbcae55 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Sun, 4 Sep 2016 22:52:33 +0530
Subject: [PATCH] `harpoon` has been renamed to `nami`

---
 bitnami/prestashop/Dockerfile               | 4 ++--
 bitnami/prestashop/rootfs/app-entrypoint.sh | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bitnami/prestashop/Dockerfile b/bitnami/prestashop/Dockerfile
index 650a29edac3c..07985e9f7256 100644
--- a/bitnami/prestashop/Dockerfile
+++ b/bitnami/prestashop/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/stacksmith-images/ubuntu:14.04-r8
+FROM gcr.io/stacksmith-images/ubuntu:14.04-r9
 
 MAINTAINER Bitnami <containers@bitnami.com>
 
@@ -23,4 +23,4 @@ EXPOSE 80 443
 
 ENTRYPOINT ["/app-entrypoint.sh"]
 
-CMD ["harpoon", "start", "--foreground", "apache"]
+CMD ["nami", "start", "--foreground", "apache"]
diff --git a/bitnami/prestashop/rootfs/app-entrypoint.sh b/bitnami/prestashop/rootfs/app-entrypoint.sh
index f33f1ea61e78..31bb67879669 100755
--- a/bitnami/prestashop/rootfs/app-entrypoint.sh
+++ b/bitnami/prestashop/rootfs/app-entrypoint.sh
@@ -3,14 +3,14 @@ set -e
 
 function initialize {
     # Package can be "installed" or "unpacked"
-    status=`harpoon inspect $1`
+    status=`nami inspect $1`
     if [[ "$status" == *'"lifecycle": "unpacked"'* ]]; then
         # Clean up inputs
         inputs=""
         if [[ -f /$1-inputs.json ]]; then
             inputs=--inputs-file=/$1-inputs.json
         fi
-        harpoon initialize $1 $inputs
+        nami initialize $1 $inputs
     fi
 }
 
@@ -27,7 +27,7 @@ export MARIADB_PORT=${MARIADB_PORT:-"3306"}
 
 
 
-if [[ "$1" == "harpoon" && "$2" == "start" ]] ||  [[ "$1" == "/init.sh" ]]; then
+if [[ "$1" == "nami" && "$2" == "start" ]] ||  [[ "$1" == "/init.sh" ]]; then
    for module in apache prestashop; do
     initialize $module
    done