From 2eef956f629ad2fbddbfd982d4b1d1864cb93a86 Mon Sep 17 00:00:00 2001 From: Sergii Leshchenko Date: Tue, 19 Feb 2019 11:17:28 +0200 Subject: [PATCH] Add -f -S flags for curl commands in installers (#12688) Signed-off-by: Sergii Leshchenko --- .../resources/installers/1.0.1/org.eclipse.che.exec.script.sh | 2 +- .../installers/1.0.1/org.eclipse.che.terminal.script.sh | 2 +- .../installers/1.0.3/org.eclipse.che.ws-agent.script.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/agents/exec/installer/src/main/resources/installers/1.0.1/org.eclipse.che.exec.script.sh b/agents/exec/installer/src/main/resources/installers/1.0.1/org.eclipse.che.exec.script.sh index e0673e8822..8c27cb3206 100644 --- a/agents/exec/installer/src/main/resources/installers/1.0.1/org.eclipse.che.exec.script.sh +++ b/agents/exec/installer/src/main/resources/installers/1.0.1/org.eclipse.che.exec.script.sh @@ -198,7 +198,7 @@ else elif curl ${CA_ARG} -o /dev/null --silent --head --fail $(echo ${AGENT_BINARIES_URI} | sed 's/-\${PREFIX}//g'); then curl ${CA_ARG} -o $(echo ${TARGET_AGENT_BINARIES_URI} | sed 's/\${PREFIX}/'${PREFIX}'/g' | sed 's/file:\/\///g') -s $(echo ${AGENT_BINARIES_URI} | sed 's/-\${PREFIX}//g') fi - curl -s $(echo ${TARGET_AGENT_BINARIES_URI} | sed 's/\${PREFIX}/'${PREFIX}'/g') | tar xzf - -C ${CHE_DIR} + curl -sSf $(echo ${TARGET_AGENT_BINARIES_URI} | sed 's/\${PREFIX}/'${PREFIX}'/g') | tar xzf - -C ${CHE_DIR} else CA_ARG="" if [ -f /tmp/che/secret/ca.crt ]; then diff --git a/agents/terminal/src/main/resources/installers/1.0.1/org.eclipse.che.terminal.script.sh b/agents/terminal/src/main/resources/installers/1.0.1/org.eclipse.che.terminal.script.sh index 5388de4ee9..55107f44c6 100644 --- a/agents/terminal/src/main/resources/installers/1.0.1/org.eclipse.che.terminal.script.sh +++ b/agents/terminal/src/main/resources/installers/1.0.1/org.eclipse.che.terminal.script.sh @@ -193,7 +193,7 @@ else elif curl ${CA_ARG} -o /dev/null --silent --head --fail $(echo ${AGENT_BINARIES_URI} | sed 's/-\${PREFIX}//g'); then curl ${CA_ARG} -o $(echo ${TARGET_AGENT_BINARIES_URI} | sed 's/\${PREFIX}/'${PREFIX}'/g' | sed 's/file:\/\///g') -s $(echo ${AGENT_BINARIES_URI} | sed 's/-\${PREFIX}//g') fi - curl -s $(echo ${TARGET_AGENT_BINARIES_URI} | sed 's/\${PREFIX}/'${PREFIX}'/g') | tar xzf - -C ${CHE_DIR} + curl -sSf $(echo ${TARGET_AGENT_BINARIES_URI} | sed 's/\${PREFIX}/'${PREFIX}'/g') | tar xzf - -C ${CHE_DIR} else CA_ARG="" if [ -f /tmp/che/secret/ca.crt ]; then diff --git a/wsagent/agent/src/main/resources/installers/1.0.3/org.eclipse.che.ws-agent.script.sh b/wsagent/agent/src/main/resources/installers/1.0.3/org.eclipse.che.ws-agent.script.sh index 9d7d98fc32..4fe9cf1363 100644 --- a/wsagent/agent/src/main/resources/installers/1.0.3/org.eclipse.che.ws-agent.script.sh +++ b/wsagent/agent/src/main/resources/installers/1.0.3/org.eclipse.che.ws-agent.script.sh @@ -272,7 +272,7 @@ else CA_ARG="--cacert /tmp/che/secret/ca.crt" fi - curl -s ${CA_ARG} ${AGENT_BINARIES_URI} | tar xzf - -C ${CHE_DIR}/ws-agent + curl -sSf ${CA_ARG} ${AGENT_BINARIES_URI} | tar xzf - -C ${CHE_DIR}/ws-agent else # replace https by http as wget may not be able to handle ssl AGENT_BINARIES_URI=$(echo ${AGENT_BINARIES_URI} | sed 's/https/http/g')