From 23f5f764945292e8342e29c6cf53d6b6d29f2f54 Mon Sep 17 00:00:00 2001
From: Jhon Honce <jhonce@redhat.com>
Date: Tue, 28 May 2013 17:38:15 -0700
Subject: [PATCH] Bug 968071 - Restore message

* send client disclaimer message
* remove empty teardown script
---
 cartridges/openshift-origin-cartridge-diy/bin/setup    | 4 ++++
 cartridges/openshift-origin-cartridge-diy/bin/teardown | 0
 2 files changed, 4 insertions(+)
 delete mode 100644 cartridges/openshift-origin-cartridge-diy/bin/teardown

diff --git a/cartridges/openshift-origin-cartridge-diy/bin/setup b/cartridges/openshift-origin-cartridge-diy/bin/setup
index 63b3e369a87..a55332b25e4 100644
--- a/cartridges/openshift-origin-cartridge-diy/bin/setup
+++ b/cartridges/openshift-origin-cartridge-diy/bin/setup
@@ -1,5 +1,7 @@
 #!/bin/bash -eu
 
+source $OPENSHIFT_CARTRIDGE_SDK_BASH
+
 case "$1" in
   -v|--version)
     version="$2"
@@ -7,3 +9,5 @@ esac
 
 # Create additional directories required by the diy cartridge
 mkdir -p $OPENSHIFT_DIY_DIR/{logs,run}
+
+client_result "Disclaimer: This is an experimental cartridge that provides a way to try unsupported languages, frameworks, and middleware on Openshift."
diff --git a/cartridges/openshift-origin-cartridge-diy/bin/teardown b/cartridges/openshift-origin-cartridge-diy/bin/teardown
deleted file mode 100644
index e69de29bb2d..00000000000