From 72396ea7f17c576db1b97484518a8c440f76f756 Mon Sep 17 00:00:00 2001
From: Alexander Mohr <thehesiod@hotmail.com>
Date: Mon, 12 Nov 2018 12:23:50 -0800
Subject: [PATCH] changes based on discussion

https://github.com/bazelbuild/rules_appengine/issues/90
---
 README.md                                 | 17 ++++++++++++++++-
 appengine/py/appengine_deploy.sh.template |  6 +++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 1179ef9..abdd57e 100644
--- a/README.md
+++ b/README.md
@@ -46,6 +46,13 @@ load(
 java_appengine_repositories()
 
 # Python
+load(
+    "@io_bazel_rules_appengine//appengine:sdk.bzl",
+    "appengine_repositories",
+)
+
+appengine_repositories()
+
 load(
     "@io_bazel_rules_appengine//appengine:py_appengine.bzl",
     "py_appengine_repositories",
@@ -334,7 +341,7 @@ java_war(name, data, data_path, **kwargs)
 <a name="py_appengine_binary"></a>
 ## py_appengine_binary
 ```python
-py_appengine_binary(name, srcs, configs, deps=[], data=[])
+py_appengine_binary(name, srcs, configs, deps=[], data=[], overwrite_appengine_config=True)
 ```
 <table class="table table-condensed table-bordered table-params">
   <colgroup>
@@ -382,6 +389,14 @@ py_appengine_binary(name, srcs, configs, deps=[], data=[])
         <p>List of files used by the Web Application at runtime.</p>
       </td>
     </tr>
+    <tr>
+      <td><code>overwrite_appengine_config</code></td>
+      <td>
+        <code>Boolean, optional</code>
+        <p>If true, patch the user's appengine_config into the base one. If false, use
+           the user specified config directly. Set to False to behave pre 0.0.8.</p>
+      </td>
+    </tr>    
   </tbody>
 </table>
 
diff --git a/appengine/py/appengine_deploy.sh.template b/appengine/py/appengine_deploy.sh.template
index 15f5465..c77a830 100644
--- a/appengine/py/appengine_deploy.sh.template
+++ b/appengine/py/appengine_deploy.sh.template
@@ -23,7 +23,11 @@ if [[ -e "$self.runfiles/%{workspace_name}" ]]; then
 fi
 
 ROOT=$PWD
-tmp_dir="$(mktemp -d "${TMPDIR:-/tmp}/war.XXXXXXXX")"
+
+# remove double slash from TMPDIR trailing slash
+tmp_dir=$(echo ${TMPDIR:-/tmp}/war.XXXXXXXX | tr -s /)
+tmp_dir="$(mktemp -d "${tmp_dir}")"
+
 cp -R $ROOT $tmp_dir
 trap "{ cd "$ROOT"; rm -rf "$tmp_dir"; }" EXIT