[tor-commits] [ooni-probe/master] Parametrise the mktemp call

art at torproject.org art at torproject.org
Fri Nov 20 14:41:58 UTC 2015


commit 5c925d1d29b62a341945b85d497f73c905091167
Author: Arturo Filastò <art at fuffa.org>
Date:   Sun Jul 12 19:47:30 2015 +0200

    Parametrise the mktemp call
---
 scripts/install.sh |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/scripts/install.sh b/scripts/install.sh
index 439112b..6efd19f 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -100,6 +100,13 @@ elif command_exists busybox && busybox --list-modules | grep -q wget; then
 	curl='busybox wget --connect-timeout 20 -qO-'
 fi
 
+mktmp=''
+if command_exists mktmp; then
+	mktmp='mktmp'
+elif command_exists mktemp; then
+	mktmp='mktemp'
+fi
+
 if [ $CLOUDFRONT = "yes" ];then
   echo '  Using the cloudfronted tor mirror.'
   TOR_DEB_REPO="https://d3skbh62gb3f3v.cloudfront.net/torproject.org" 
@@ -136,7 +143,7 @@ install_obfs4proxy() {
   if command_exists go; then
     (
       set -x
-      export GOPATH=$(mktmp -d)
+      export GOPATH=$($mktmp -d)
       go get git.torproject.org/pluggable-transports/obfs4.git/obfs4proxy
       $sh_c "cp $GOPATH/bin/obfs4proxy /usr/local/bin/obfs4proxy"
       $sh_c "chmod +x /usr/local/bin/obfs4proxy"





More information about the tor-commits mailing list