From a229c3e292c106e67985bbc56ca800fcde871622 Mon Sep 17 00:00:00 2001 From: The_Spider Date: Sun, 30 Aug 2020 11:13:20 -0500 Subject: [PATCH] escapes variables for jenkins. --- build-deluge.jenkins | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/build-deluge.jenkins b/build-deluge.jenkins index 90f49c0..2e2b06c 100644 --- a/build-deluge.jenkins +++ b/build-deluge.jenkins @@ -46,46 +46,45 @@ spec: container('kaniko') { def connectivity_test = """ #! /usr/bin/env bash -if [[ -z "${DDNS_HOST}" ]] || [[ "${DDNS_HOST}" == "" ]]; then +if [[ -z "\${DDNS_HOST}" ]] || [[ "\${DDNS_HOST}" == "" ]]; then printf '%s\n' "Dynamic DNS host is not set." exit 100 fi printf '%s\n' "Detecting public IP" DIP=$(dig @ns1.google.com TXT o-o.myaddr.l.google.com +short | sed -e 's/"//g') -if [[ -z "${DIP+x}" ]] || [[ "${DIP}" == "" ]]; then +if [[ -z "\${DIP+x}" ]] || [[ "\${DIP}" == "" ]]; then printf '%s\n' "Unable to detect real-world IP." exit 100 fi printf '%s\n' "Getting known IP" -KIP=$(dig ${DDNS_HOST} +short) -if [[ -z "${KIP+x}" ]] || [[ "${KIP}" == "" ]]; then +KIP=$(dig \${DDNS_HOST} +short) +if [[ -z "\${KIP+x}" ]] || [[ "\${KIP}" == "" ]]; then printf '%s\n' "Unable to get known IP." exit 100 fi -if [[ "${DIP}" == "${KIP}" ]]; then +if [[ "\${DIP}" == "\${KIP}" ]]; then printf '%s\n' "VPN is not functional." exit 100 fi printf '%s\n' "Checking connectivity (1 of 2)" ping -c 2 google.com > /dev/null -if [[ "${?}" != "0" ]]; then +if [[ "\${?}" != "0" ]]; then printf '%s\n' "No internet connectivity." exit 100 fi printf '%s\n' "Checking connectivity (2 of 2)" curl --silent --fail --insecure https://www.msftncsi.com/ncsi.txt > /dev/null -if [[ "${?}" != "0" ]]; then +if [[ "\${?}" != "0" ]]; then printf '%s\n' "No internet connectivity." exit 100 fi """ - def dockerfile = """FROM linuxserver/deluge:amd64-latest COPY connectivity_test.sh /root