[tor-commits] [tor-messenger-build/master] Set proper ENV defaults

[sukhbir at torproject.org]

commit d92914ee2dd588b1f3f654b0d01e6f3ec527b984
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Mon Aug 28 16:53:18 2017 -0400

    Set proper ENV defaults
---
 projects/ctypes-otr/build   | 5 +++--
 projects/libgcrypt/build    | 4 ++--
 projects/libgpg-error/build | 4 ++--
 projects/libotr/build       | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/projects/ctypes-otr/build b/projects/ctypes-otr/build
index 913a3e0..fa60e7f 100644
--- a/projects/ctypes-otr/build
+++ b/projects/ctypes-otr/build
@@ -1,5 +1,6 @@
-#!/bin/sh
-set -e
+#!/bin/bash
+[% c("var/set_default_env") -%]
+
 tar xf [% project %]-[% c('version') %].tar.gz
 tar xf [% c('input_files_by_name/libotr') %]
 mv libotr/[% c('var/lib_glob') %] [% project %]-[% c('version') %]/chrome/content/
diff --git a/projects/libgcrypt/build b/projects/libgcrypt/build
index 3e85542..ac27285 100644
--- a/projects/libgcrypt/build
+++ b/projects/libgcrypt/build
@@ -1,6 +1,6 @@
 #!/bin/bash
-set -e
-rootdir=$(pwd)
+[% c("var/set_default_env") -%]
+
 [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
 mkdir -p /var/tmp/dist
 cd /var/tmp/dist
diff --git a/projects/libgpg-error/build b/projects/libgpg-error/build
index 6bdb462..9e2efe0 100644
--- a/projects/libgpg-error/build
+++ b/projects/libgpg-error/build
@@ -1,6 +1,6 @@
 #!/bin/bash
-set -e
-rootdir=$(pwd)
+[% c("var/set_default_env") -%]
+
 distdir="/var/tmp/dist/[% project %]"
 mkdir -p "$distdir"
 [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
diff --git a/projects/libotr/build b/projects/libotr/build
index 2b02051..2f49602 100755
--- a/projects/libotr/build
+++ b/projects/libotr/build
@@ -1,6 +1,6 @@
 #!/bin/bash
-set -e
-rootdir=$(pwd)
+[% c("var/set_default_env") -%]
+
 [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
 mkdir -p /var/tmp/dist
 cd /var/tmp/dist