[tor-commits] [tor-messenger-build/master] Fix applying patches in mozilla/ on build-sunet-b.tp.net

[arlo at torproject.org]

commit f79f8675cedaada4668d9a94b9fd7215d7b3b6a6
Author: Arlo Breault <arlolra at gmail.com>
Date:   Tue Oct 10 19:30:31 2017 -0400

    Fix applying patches in mozilla/ on build-sunet-b.tp.net
---
 projects/mozilla/build | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/projects/mozilla/build b/projects/mozilla/build
index ab18d69..d1b26a2 100644
--- a/projects/mozilla/build
+++ b/projects/mozilla/build
@@ -1,17 +1,13 @@
-#!/bin/sh
-set -e
-rootdir=$(pwd)
+#!/bin/bash
+[% c("var/set_default_env") -%]
 
 tar xf [% project %]-[% c('version') %].tar.gz
 cd [% project %]-[% c('version') %]
 
-if ls -1 $rootdir/*.patch > /dev/null 2>&1
-then
-    for patch in $(ls -1 $rootdir/*.patch | sort)
-    do
-        git apply -p1 < $patch
-    done
-fi
+for patch in $(ls -1 $rootdir/*.patch | sort)
+do
+  git apply -p1 < $patch
+done
 
 cd ..