From 199526961462f40278d9225ab479bf2d082e69a6 Mon Sep 17 00:00:00 2001 From: Quentin De Coninck Date: Wed, 20 Apr 2016 14:17:22 +0200 Subject: [PATCH] Revert "mpExperienceHTTP(S): avoid subshelling" This reverts commit 8ff032cb99d5344853b125164e604514aa0d9893. Seems not all bash systems like this --- src/mpExperienceHTTP.py | 4 ++-- src/mpExperienceHTTPS.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mpExperienceHTTP.py b/src/mpExperienceHTTP.py index 362e4d4..3d81acd 100644 --- a/src/mpExperienceHTTP.py +++ b/src/mpExperienceHTTP.py @@ -55,8 +55,8 @@ class MpExperienceHTTP(MpExperience): return s def getHTTPClientCmd(self): - s = "{time " + MpExperienceHTTP.WGET_BIN + " http://" + self.mpConfig.getServerIP() + \ - "/" + self.file + " --no-check-certificate} &>" + MpExperienceHTTP.CLIENT_LOG + s = "(time " + MpExperienceHTTP.WGET_BIN + " http://" + self.mpConfig.getServerIP() + \ + "/" + self.file + " --no-check-certificate) &>" + MpExperienceHTTP.CLIENT_LOG print(s) return s diff --git a/src/mpExperienceHTTPS.py b/src/mpExperienceHTTPS.py index 640d600..2706275 100644 --- a/src/mpExperienceHTTPS.py +++ b/src/mpExperienceHTTPS.py @@ -55,8 +55,8 @@ class MpExperienceHTTPS(MpExperience): return s def getHTTPSClientCmd(self): - s = "{time " +MpExperienceHTTPS.WGET_BIN + " https://" + self.mpConfig.getServerIP() + \ - "/" + self.file + " --no-check-certificate} &>" + MpExperienceHTTPS.CLIENT_LOG + s = "(time " +MpExperienceHTTPS.WGET_BIN + " https://" + self.mpConfig.getServerIP() + \ + "/" + self.file + " --no-check-certificate) &>" + MpExperienceHTTPS.CLIENT_LOG print(s) return s