Skip to content

L
lxc
Unverified Commit 5408652d by Stéphane Graber Committed by GitHub
Options

Merge pull request #3468 from johanneskastl/20200630_Kastl_fix_shell_download_template

templates/lxc-download.in: fix wrong if-condition
parents f88d8e68 eb44984a
Showing with 3 additions and 3 deletions
templates/lxc-download.in
...@@ -134,8 +134,8 @@ gpg_setup() { ...@@ -134,8 +134,8 @@ gpg_setup() {
success= success=
for _ in $(seq 3); do for _ in $(seq 3); do
if $(gpg --keyserver "${DOWNLOAD_KEYSERVER}" ${DOWNLOAD_GPG_PROXY:-} \ if gpg --keyserver "${DOWNLOAD_KEYSERVER}" ${DOWNLOAD_GPG_PROXY:-} \
--recv-keys "${DOWNLOAD_KEYID}" >/dev/null 2>&1); then --recv-keys "${DOWNLOAD_KEYID}" >/dev/null 2>&1; then
success=1 success=1
break break
fi fi
...@@ -327,7 +327,7 @@ if ! command -V mktemp >/dev/null 2>&1; then ...@@ -327,7 +327,7 @@ if ! command -V mktemp >/dev/null 2>&1; then
DOWNLOAD_TEMP="${DOWNLOAD_TEMP}/tmp/lxc-download.$$" DOWNLOAD_TEMP="${DOWNLOAD_TEMP}/tmp/lxc-download.$$"
elif [ -n "${DOWNLOAD_TEMP}" ]; then elif [ -n "${DOWNLOAD_TEMP}" ]; then
mkdir -p "${DOWNLOAD_TEMP}" mkdir -p "${DOWNLOAD_TEMP}"
DOWNLOAD_TEMP="$(mktemp -p ${DOWNLOAD_TEMP} -d)" DOWNLOAD_TEMP="$(mktemp -p "${DOWNLOAD_TEMP}" -d)"
else else
DOWNLOAD_TEMP="${DOWNLOAD_TEMP}$(mktemp -d)" DOWNLOAD_TEMP="${DOWNLOAD_TEMP}$(mktemp -d)"
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment