From 9feff82c49ab6c4231d09cd0bf80ca560e0d9d4e Mon Sep 17 00:00:00 2001
From: Reinhard Schmitz <reinhard.schmitz@pixelpark.com>
Date: Wed, 8 Nov 2023 14:48:11 +0100
Subject: [PATCH] Fix curl syntax errors

---
 bin/postinst                         | 18 +++++++++---------
 bin/postinst.chrony                  | 18 +++++++++---------
 snippets/tpl.010.authkeys.sh         |  2 +-
 snippets/tpl.080.rsyslogd-el7.sh     |  4 ++--
 snippets/tpl.080.rsyslogd-el8.sh     |  4 ++--
 snippets/tpl.080.rsyslogd-el9.sh     |  4 ++--
 snippets/tpl.170.repos_centos7.sh    |  2 +-
 snippets/tpl.170.repos_oel7.sh       |  2 +-
 snippets/tpl.175.repos_el7.sh        |  2 +-
 snippets/tpl.180.repos_almalinux8.sh |  2 +-
 snippets/tpl.180.repos_centos8.sh    |  2 +-
 snippets/tpl.180.repos_rocky8.sh     |  2 +-
 snippets/tpl.185.repos_el8.sh        |  2 +-
 snippets/tpl.190.repos_almalinux9.sh |  2 +-
 snippets/tpl.190.repos_centos9.sh    |  2 +-
 snippets/tpl.190.repos_rhel9.sh      |  2 +-
 snippets/tpl.195.repos_el9.sh        |  2 +-
 snippets/tpl.205.bashrc-el7.sh       |  2 +-
 snippets/tpl.210.bashrc-el8.sh       |  2 +-
 snippets/tpl.211.bashrc-el9.sh       |  2 +-
 snippets/tpl.225.vimrc-el7.sh        |  2 +-
 snippets/tpl.230.vimrc-el8.sh        |  2 +-
 snippets/tpl.231.vimrc-el9.sh        |  2 +-
 snippets/tpl.300.create-motd.sh      |  2 +-
 snippets/tpl.470.postfix.sh          |  4 ++--
 snippets/tpl.500.logrotate.sh        |  4 ++--
 26 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/bin/postinst b/bin/postinst
index d15d34d..bd41221 100644
--- a/bin/postinst
+++ b/bin/postinst
@@ -68,7 +68,7 @@ create_authkeys() {
     echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDZ3QNzqiDE6jUzmXnOzIM93mZBPZtSDbCgYQd8xwOz9ZROxqLcckr8qIvyLFDv/fedwQlLDTg90LGX/zHHAB0T+0DB2dMFOWeSloIMMp+0WwG9i6H0ty6NUVSktvG6h4jbgkhMhHGUEHhxgR2LgxTjq8fpcMOLJ4HLLGW9W3BQOVtoi8hiffKm5DB9Au0HgNvXP/UrCQkBtFzMyhRb7D7aFyDyU/7SuM6m17DIYNx1cg79AH3mjRTQXaOVBrOBJ4uaqy6srbGzWs5FSIMMbgOrcmZRw5GilrG5dBbT/OQSN+sHlECx216pyLrbSWcwG1Fo11iI53pnColRUljMIPJ+XRffxT2yINEfyvfr0GGMKi4c5fcDumgYwT2+foefy72sBhNwKhzjuGySPgRU/1PH8oIcu4TJWyW1xi0AfVZnJhjU5RKeWQ9VMhh1nDntpRdD5z+0FrAL+9AINW4Bjboc6OisikIABBeoT9mbYNNGdHA7rpdJwURycJDpJDhyr0voNnmQ15JF6KZebM0+OW9apTxdotKPKYJ8pFBRGXrTENSVvFNIBbYD55IJ2MlOD2eX6XX2/tnHMdZHCE9Gi22Y8p1oiahLtCU3Th8WwazQlh4H9xAJzK0jp7MOpI3Y553i8zBU47VpO5juELH2bCNwChpdbZbY0i6MxQF61d2iJw== create-vmware-tpl@pixelpark.com" >> /root/.ssh/authorized_keys
 
     local tmp_file=$( mktemp )
-    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" || true
     if [[ -s "${tmp_file}" ]] ; then
         cat "${tmp_file}" >> /root/.ssh/authorized_keys
     fi
@@ -93,7 +93,7 @@ import_ssh_hostkeys() {
         for fullname in "${stem}" "${stem}.pub" ; do
             tmp_file=$( mktemp )
             url="${COBBLER_URL}/custom/create-vmware-tpl/keys/${fullname}"
-            curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}"
+            curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}"
             if [[ -s "${tmp_file}" ]] ; then
                 mv -v "${tmp_file}" "/etc/ssh/${fullname}"
                 if [[ "${stem}" == "${fullname}" ]] ; then
@@ -361,7 +361,7 @@ install_epel() {
         tgt="/etc/yum.repos.d/${bname}"
         echo
         echo "Retrieving '${url}' -> '${tgt}' ..."
-        if curl -s -S -o "${tgt}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
+        if curl -s -S -o "${tgt}" --connect-timeout 3 --expect100-timeout 3 "${url}" ; then
             :
         else
             echo "[$(date)]: Could not get '${bname}' from '${url}'." | tee -a "${ERROR_POINTER}"
@@ -381,7 +381,7 @@ install_epel() {
         tgt="/etc/pki/rpm-gpg/${bname}"
         echo
         echo "Retrieving '${url}' -> '${tgt}' ..."
-        if curl -s -S -o "${tgt}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
+        if curl -s -S -o "${tgt}" --connect-timeout 3 --expect100-timeout 3 "${url}" ; then
             :
         else
             echo "[$(date)]: Could not get '${bname}' from '${url}'." | tee -a "${ERROR_POINTER}"
@@ -425,7 +425,7 @@ install_pp_tcsh_env() {
     local local_tar=$( mktemp -p /tmp "linux_tcsh.XXXXXXXX.tar" )
 
     echo "Local tar file: '${local_tar}'."
-    if curl -s -S -o "${local_tar}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
+    if curl -s -S -o "${local_tar}" --connect-timeout 3 --expect100-timeout 3 "${url}" ; then
         :
     else
         echo "[$(date)]: Could not get 'linux_tcsh.tar' from '${url}'." | tee -a "${ERROR_POINTER}"
@@ -447,7 +447,7 @@ install_pp_tcsh_env() {
     url="${COBBLER_URL}/custom/create-vmware-tpl/files/fbr.sh"
     local tgt="/etc/profile.d/fbr.sh"
     echo "Retrieving '${url}' -> '${tgt}' ..."
-    if curl -s -S -o "${tgt}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
+    if curl -s -S -o "${tgt}" --connect-timeout 3 --expect100-timeout 3 "${url}" ; then
         :
     else
         echo "[$(date)]: Could not get 'fbr.sh' from '${url}'." | tee -a "${ERROR_POINTER}"
@@ -552,7 +552,7 @@ create_motd() {
     echo
     log "Creating initial /etc/motd ..."
     local mk_script=$( mktemp -p /tmp "mk_create_motd.XXXXXXXXXX.ksh" )
-    if curl -s -S -o "${mk_script}" --connect-timeout=3 --expect100-timeout=3 "${url}"; then
+    if curl -s -S -o "${mk_script}" --connect-timeout 3 --expect100-timeout 3 "${url}"; then
         chmod 0755 "${mk_script}"
         "${mk_script}" -i 192.168.88.0/23 \
                        -p "Template VM" \
@@ -1059,7 +1059,7 @@ config_logrotate() {
     local tgt="/etc/logrotate.conf"
 
     echo "Getting ${url} => ${tgt} ..."
-    if curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
+    if curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" ; then
         :
     else
         echo "[$(date)]: Could not get 'logrotate.conf' from '${url}'." | tee -a "${ERROR_POINTER}"
@@ -1074,7 +1074,7 @@ config_logrotate() {
         tgt="/etc/logrotate.d/${base}"
         cp -v /dev/null "${tmp_file}"
         echo "Getting ${url} => ${tgt} ..."
-        if curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
+        if curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" ; then
             :
         else
             echo "[$(date)]: Could not get '${base}' from '${url}'." | tee -a "${ERROR_POINTER}"
diff --git a/bin/postinst.chrony b/bin/postinst.chrony
index adc5d08..caa6613 100644
--- a/bin/postinst.chrony
+++ b/bin/postinst.chrony
@@ -64,7 +64,7 @@ create_authkeys() {
     echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDZ3QNzqiDE6jUzmXnOzIM93mZBPZtSDbCgYQd8xwOz9ZROxqLcckr8qIvyLFDv/fedwQlLDTg90LGX/zHHAB0T+0DB2dMFOWeSloIMMp+0WwG9i6H0ty6NUVSktvG6h4jbgkhMhHGUEHhxgR2LgxTjq8fpcMOLJ4HLLGW9W3BQOVtoi8hiffKm5DB9Au0HgNvXP/UrCQkBtFzMyhRb7D7aFyDyU/7SuM6m17DIYNx1cg79AH3mjRTQXaOVBrOBJ4uaqy6srbGzWs5FSIMMbgOrcmZRw5GilrG5dBbT/OQSN+sHlECx216pyLrbSWcwG1Fo11iI53pnColRUljMIPJ+XRffxT2yINEfyvfr0GGMKi4c5fcDumgYwT2+foefy72sBhNwKhzjuGySPgRU/1PH8oIcu4TJWyW1xi0AfVZnJhjU5RKeWQ9VMhh1nDntpRdD5z+0FrAL+9AINW4Bjboc6OisikIABBeoT9mbYNNGdHA7rpdJwURycJDpJDhyr0voNnmQ15JF6KZebM0+OW9apTxdotKPKYJ8pFBRGXrTENSVvFNIBbYD55IJ2MlOD2eX6XX2/tnHMdZHCE9Gi22Y8p1oiahLtCU3Th8WwazQlh4H9xAJzK0jp7MOpI3Y553i8zBU47VpO5juELH2bCNwChpdbZbY0i6MxQF61d2iJw== create-vmware-tpl@pixelpark.com" >> /root/.ssh/authorized_keys
 
     local tmp_file=$( mktemp )
-    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" || true
     if [[ -s "${tmp_file}" ]] ; then
         cat "${tmp_file}" >> /root/.ssh/authorized_keys
     fi
@@ -89,7 +89,7 @@ import_ssh_hostkeys() {
         for fullname in "${stem}" "${stem}.pub" ; do
             tmp_file=$( mktemp )
             url="${COBBLER_URL}/custom/create-vmware-tpl/keys/${fullname}"
-            curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}"
+            curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}"
             if [[ -s "${tmp_file}" ]] ; then
                 mv -v "${tmp_file}" "/etc/ssh/${fullname}"
                 if [[ "${stem}" == "${fullname}" ]] ; then
@@ -347,7 +347,7 @@ install_epel() {
         tgt="/etc/yum.repos.d/${bname}"
         echo
         echo "Retrieving '${url}' -> '${tgt}' ..."
-        if curl -s -S -o "${tgt}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
+        if curl -s -S -o "${tgt}" --connect-timeout 3 --expect100-timeout 3 "${url}" ; then
             :
         else
             echo "[$(date)]: Could not get '${bname}' from '${url}'." | tee -a "${ERROR_POINTER}"
@@ -367,7 +367,7 @@ install_epel() {
         tgt="/etc/pki/rpm-gpg/${bname}"
         echo
         echo "Retrieving '${url}' -> '${tgt}' ..."
-        if curl -s -S -o "${tgt}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
+        if curl -s -S -o "${tgt}" --connect-timeout 3 --expect100-timeout 3 "${url}" ; then
             :
         else
             echo "[$(date)]: Could not get '${bname}' from '${url}'." | tee -a "${ERROR_POINTER}"
@@ -411,7 +411,7 @@ install_pp_tcsh_env() {
     local local_tar=$( mktemp -p /tmp "linux_tcsh.XXXXXXXX.tar" )
 
     echo "Local tar file: '${local_tar}'."
-    if curl -s -S -o "${local_tar}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
+    if curl -s -S -o "${local_tar}" --connect-timeout 3 --expect100-timeout 3 "${url}" ; then
         :
     else
         echo "[$(date)]: Could not get 'linux_tcsh.tar' from '${url}'." | tee -a "${ERROR_POINTER}"
@@ -433,7 +433,7 @@ install_pp_tcsh_env() {
     url="${COBBLER_URL}/custom/create-vmware-tpl/files/fbr.sh"
     local tgt="/etc/profile.d/fbr.sh"
     echo "Retrieving '${url}' -> '${tgt}' ..."
-    if curl -s -S -o "${tgt}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
+    if curl -s -S -o "${tgt}" --connect-timeout 3 --expect100-timeout 3 "${url}" ; then
         :
     else
         echo "[$(date)]: Could not get 'fbr.sh' from '${url}'." | tee -a "${ERROR_POINTER}"
@@ -538,7 +538,7 @@ create_motd() {
     echo
     log "Creating initial /etc/motd ..."
     local mk_script=$( mktemp -p /tmp "mk_create_motd.XXXXXXXXXX.ksh" )
-    if curl -s -S -o "${mk_script}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
+    if curl -s -S -o "${mk_script}" --connect-timeout 3 --expect100-timeout 3 "${url}" ; then
         chmod 0755 "${mk_script}"
         "${mk_script}" -i 192.168.88.0/23 \
                        -p "Template VM" \
@@ -1098,7 +1098,7 @@ config_logrotate() {
     local tgt="/etc/logrotate.conf"
 
     echo "Getting ${url} => ${tgt} ..."
-    if curl -s -S -o "${tgt}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
+    if curl -s -S -o "${tgt}" --connect-timeout 3 --expect100-timeout 3 "${url}" ; then
         :
     else
         echo "[$(date)]: Could not get 'logrotate.conf' from '${url}'." | tee -a "${ERROR_POINTER}"
@@ -1113,7 +1113,7 @@ config_logrotate() {
         tgt="/etc/logrotate.d/${base}"
         cp -v /dev/null "${tmp_file}"
         echo "Getting ${url} => ${tgt} ..."
-        if curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
+        if curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" ; then
             :
         else
             echo "[$(date)]: Could not get '${base}' from '${url}'." | tee -a "${ERROR_POINTER}"
diff --git a/snippets/tpl.010.authkeys.sh b/snippets/tpl.010.authkeys.sh
index d8ae886..58c7cce 100644
--- a/snippets/tpl.010.authkeys.sh
+++ b/snippets/tpl.010.authkeys.sh
@@ -20,7 +20,7 @@ create_authkeys() {
     echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDZ3QNzqiDE6jUzmXnOzIM93mZBPZtSDbCgYQd8xwOz9ZROxqLcckr8qIvyLFDv/fedwQlLDTg90LGX/zHHAB0T+0DB2dMFOWeSloIMMp+0WwG9i6H0ty6NUVSktvG6h4jbgkhMhHGUEHhxgR2LgxTjq8fpcMOLJ4HLLGW9W3BQOVtoi8hiffKm5DB9Au0HgNvXP/UrCQkBtFzMyhRb7D7aFyDyU/7SuM6m17DIYNx1cg79AH3mjRTQXaOVBrOBJ4uaqy6srbGzWs5FSIMMbgOrcmZRw5GilrG5dBbT/OQSN+sHlECx216pyLrbSWcwG1Fo11iI53pnColRUljMIPJ+XRffxT2yINEfyvfr0GGMKi4c5fcDumgYwT2+foefy72sBhNwKhzjuGySPgRU/1PH8oIcu4TJWyW1xi0AfVZnJhjU5RKeWQ9VMhh1nDntpRdD5z+0FrAL+9AINW4Bjboc6OisikIABBeoT9mbYNNGdHA7rpdJwURycJDpJDhyr0voNnmQ15JF6KZebM0+OW9apTxdotKPKYJ8pFBRGXrTENSVvFNIBbYD55IJ2MlOD2eX6XX2/tnHMdZHCE9Gi22Y8p1oiahLtCU3Th8WwazQlh4H9xAJzK0jp7MOpI3Y553i8zBU47VpO5juELH2bCNwChpdbZbY0i6MxQF61d2iJw== create-vmware-tpl@pixelpark.com" >> /root/.ssh/authorized_keys
 
     local tmp_file=$( mktemp )
-    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" || true
     if [[ -s "${tmp_file}" ]] ; then
         cat "${tmp_file}" >> /root/.ssh/authorized_keys
     fi
diff --git a/snippets/tpl.080.rsyslogd-el7.sh b/snippets/tpl.080.rsyslogd-el7.sh
index ed0e41f..d95fb9f 100644
--- a/snippets/tpl.080.rsyslogd-el7.sh
+++ b/snippets/tpl.080.rsyslogd-el7.sh
@@ -32,7 +32,7 @@ set_rsyslogd_el7() {
     log "Rewriting /etc/rsyslog.conf ..."
 
     local tmp_file=$( mktemp )
-    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url_top}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url_top}" || true
     if [[ -s "${tmp_file}" ]] ; then
         cp -p /etc/rsyslog.conf /etc/rsyslog.conf.orig
         mv -v "${tmp_file}" /etc/rsyslog.conf
@@ -44,7 +44,7 @@ set_rsyslogd_el7() {
     log "Rewriting /etc/rsyslog.d/50_rsyslog.conf ..."
 
     tmp_file=$( mktemp )
-    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url_sub}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url_sub}" || true
     if [[ -s "${tmp_file}" ]] ; then
         mv -v "${tmp_file}" /etc/rsyslog.d/50_rsyslog.conf
         chmod -v 0644 /etc/rsyslog.d/50_rsyslog.conf
diff --git a/snippets/tpl.080.rsyslogd-el8.sh b/snippets/tpl.080.rsyslogd-el8.sh
index 2128fad..ba193bb 100644
--- a/snippets/tpl.080.rsyslogd-el8.sh
+++ b/snippets/tpl.080.rsyslogd-el8.sh
@@ -32,7 +32,7 @@ set_rsyslogd_el8() {
     log "Rewriting /etc/rsyslog.conf ..."
 
     local tmp_file=$( mktemp )
-    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url_top}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url_top}" || true
     if [[ -s "${tmp_file}" ]] ; then
         cp -p /etc/rsyslog.conf /etc/rsyslog.conf.orig
         mv -v "${tmp_file}" /etc/rsyslog.conf
@@ -44,7 +44,7 @@ set_rsyslogd_el8() {
     log "Rewriting /etc/rsyslog.d/50_rsyslog.conf ..."
 
     tmp_file=$( mktemp )
-    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url_sub}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url_sub}" || true
     if [[ -s "${tmp_file}" ]] ; then
         mv -v "${tmp_file}" /etc/rsyslog.d/50_rsyslog.conf
         chmod -v 0644 /etc/rsyslog.d/50_rsyslog.conf
diff --git a/snippets/tpl.080.rsyslogd-el9.sh b/snippets/tpl.080.rsyslogd-el9.sh
index 3cb232b..69689b9 100644
--- a/snippets/tpl.080.rsyslogd-el9.sh
+++ b/snippets/tpl.080.rsyslogd-el9.sh
@@ -32,7 +32,7 @@ set_rsyslogd_el9() {
     log "Rewriting /etc/rsyslog.conf ..."
 
     local tmp_file=$( mktemp )
-    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url_top}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url_top}" || true
     if [[ -s "${tmp_file}" ]] ; then
         cp -p /etc/rsyslog.conf /etc/rsyslog.conf.orig
         mv -v "${tmp_file}" /etc/rsyslog.conf
@@ -44,7 +44,7 @@ set_rsyslogd_el9() {
     log "Rewriting /etc/rsyslog.d/50_rsyslog.conf ..."
 
     tmp_file=$( mktemp )
-    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url_sub}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url_sub}" || true
     if [[ -s "${tmp_file}" ]] ; then
         mv -v "${tmp_file}" /etc/rsyslog.d/50_rsyslog.conf
         chmod -v 0644 /etc/rsyslog.d/50_rsyslog.conf
diff --git a/snippets/tpl.170.repos_centos7.sh b/snippets/tpl.170.repos_centos7.sh
index 647d710..85c7f95 100644
--- a/snippets/tpl.170.repos_centos7.sh
+++ b/snippets/tpl.170.repos_centos7.sh
@@ -20,7 +20,7 @@ get_repos_centos7() {
         echo "Ensuring repo '${repo}.repo'..."
         url="${base_url}/${repo}.repo"
         tmp_file=$( mktemp )
-        curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
+        curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" || true
         if [[ -s "${tmp_file}" ]] ; then
             mv -v "${tmp_file}" "/etc/yum.repos.d/${repo}.repo"
         fi
diff --git a/snippets/tpl.170.repos_oel7.sh b/snippets/tpl.170.repos_oel7.sh
index ffd5de4..02cff86 100644
--- a/snippets/tpl.170.repos_oel7.sh
+++ b/snippets/tpl.170.repos_oel7.sh
@@ -20,7 +20,7 @@ get_repos_oel7() {
         echo "Ensuring repo '${repo}.repo'..."
         url="${base_url}/${repo}.repo"
         tmp_file=$( mktemp )
-        curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
+        curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" || true
         if [[ -s "${tmp_file}" ]] ; then
             mv -v "${tmp_file}" "/etc/yum.repos.d/${repo}.repo"
         fi
diff --git a/snippets/tpl.175.repos_el7.sh b/snippets/tpl.175.repos_el7.sh
index e87b3b1..07c5d11 100644
--- a/snippets/tpl.175.repos_el7.sh
+++ b/snippets/tpl.175.repos_el7.sh
@@ -20,7 +20,7 @@ get_repos_el7() {
         echo "Ensuring repo '${repo}.repo'..."
         url="${base_url}/${repo}.repo"
         tmp_file=$( mktemp )
-        curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
+        curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" || true
         if [[ -s "${tmp_file}" ]] ; then
             mv -v "${tmp_file}" "/etc/yum.repos.d/${repo}.repo"
         fi
diff --git a/snippets/tpl.180.repos_almalinux8.sh b/snippets/tpl.180.repos_almalinux8.sh
index 1fb3ed4..2db07d8 100644
--- a/snippets/tpl.180.repos_almalinux8.sh
+++ b/snippets/tpl.180.repos_almalinux8.sh
@@ -21,7 +21,7 @@ get_repos_almalinux8() {
         echo "Ensuring repo '${repo}.repo'..."
         url="${base_url}/${repo}.repo"
         tmp_file=$( mktemp )
-        curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
+        curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" || true
         if [[ -s "${tmp_file}" ]] ; then
             mv -v "${tmp_file}" "/etc/yum.repos.d/${repo}.repo"
         fi
diff --git a/snippets/tpl.180.repos_centos8.sh b/snippets/tpl.180.repos_centos8.sh
index 5056199..101a171 100644
--- a/snippets/tpl.180.repos_centos8.sh
+++ b/snippets/tpl.180.repos_centos8.sh
@@ -21,7 +21,7 @@ get_repos_centos8() {
         echo "Ensuring repo '${repo}.repo'..."
         url="${base_url}/${repo}.repo"
         tmp_file=$( mktemp )
-        curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
+        curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" || true
         if [[ -s "${tmp_file}" ]] ; then
             mv -v "${tmp_file}" "/etc/yum.repos.d/${repo}.repo"
         fi
diff --git a/snippets/tpl.180.repos_rocky8.sh b/snippets/tpl.180.repos_rocky8.sh
index 4fa1695..a0e9c6d 100644
--- a/snippets/tpl.180.repos_rocky8.sh
+++ b/snippets/tpl.180.repos_rocky8.sh
@@ -21,7 +21,7 @@ get_repos_rocky8() {
         echo "Ensuring repo '${repo}.repo'..."
         url="${base_url}/${repo}.repo"
         tmp_file=$( mktemp )
-        curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
+        curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" || true
         if [[ -s "${tmp_file}" ]] ; then
             mv -v "${tmp_file}" "/etc/yum.repos.d/${repo}.repo"
         fi
diff --git a/snippets/tpl.185.repos_el8.sh b/snippets/tpl.185.repos_el8.sh
index 165c953..96bb0c5 100644
--- a/snippets/tpl.185.repos_el8.sh
+++ b/snippets/tpl.185.repos_el8.sh
@@ -20,7 +20,7 @@ get_repos_el8() {
         echo "Ensuring repo '${repo}.repo'..."
         url="${base_url}/${repo}.repo"
         tmp_file=$( mktemp )
-        curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
+        curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" || true
         if [[ -s "${tmp_file}" ]] ; then
             mv -v "${tmp_file}" "/etc/yum.repos.d/${repo}.repo"
         fi
diff --git a/snippets/tpl.190.repos_almalinux9.sh b/snippets/tpl.190.repos_almalinux9.sh
index 252892b..97f2720 100644
--- a/snippets/tpl.190.repos_almalinux9.sh
+++ b/snippets/tpl.190.repos_almalinux9.sh
@@ -22,7 +22,7 @@ get_repos_almalinux9() {
         echo "Ensuring repo '${repo}.repo'..."
         url="${base_url}/${repo}.repo"
         tmp_file=$( mktemp )
-        curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
+        curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" || true
         if [[ -s "${tmp_file}" ]] ; then
             mv -v "${tmp_file}" "/etc/yum.repos.d/${repo}.repo"
         fi
diff --git a/snippets/tpl.190.repos_centos9.sh b/snippets/tpl.190.repos_centos9.sh
index 6b588a1..4e329a6 100644
--- a/snippets/tpl.190.repos_centos9.sh
+++ b/snippets/tpl.190.repos_centos9.sh
@@ -20,7 +20,7 @@ get_repos_centos9() {
         echo "Ensuring repo '${repo}.repo'..."
         url="${base_url}/${repo}.repo"
         tmp_file=$( mktemp )
-        curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
+        curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" || true
         if [[ -s "${tmp_file}" ]] ; then
             mv -v "${tmp_file}" "/etc/yum.repos.d/${repo}.repo"
         fi
diff --git a/snippets/tpl.190.repos_rhel9.sh b/snippets/tpl.190.repos_rhel9.sh
index 37f3e92..20347cb 100644
--- a/snippets/tpl.190.repos_rhel9.sh
+++ b/snippets/tpl.190.repos_rhel9.sh
@@ -48,7 +48,7 @@ get_repos_rhel9() {
         echo "Ensuring repo '${repo}.repo'..."
         url="${base_url}/${repo}.repo"
         tmp_file=$( mktemp )
-        curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
+        curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" || true
         if [[ -s "${tmp_file}" ]] ; then
             sed -i -e "s|\${REPO_SERVER}|${redhat_repo_server}|g" \
                    -e "s|\${PATH_PREFIX}|${redhat_repo_path_prefix}|g" \
diff --git a/snippets/tpl.195.repos_el9.sh b/snippets/tpl.195.repos_el9.sh
index 3f16940..8e654ad 100644
--- a/snippets/tpl.195.repos_el9.sh
+++ b/snippets/tpl.195.repos_el9.sh
@@ -20,7 +20,7 @@ get_repos_el9() {
         echo "Ensuring repo '${repo}.repo'..."
         url="${base_url}/${repo}.repo"
         tmp_file=$( mktemp )
-        curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
+        curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" || true
         if [[ -s "${tmp_file}" ]] ; then
             mv -v "${tmp_file}" "/etc/yum.repos.d/${repo}.repo"
         fi
diff --git a/snippets/tpl.205.bashrc-el7.sh b/snippets/tpl.205.bashrc-el7.sh
index 3e8a13c..c778539 100644
--- a/snippets/tpl.205.bashrc-el7.sh
+++ b/snippets/tpl.205.bashrc-el7.sh
@@ -15,7 +15,7 @@ set_bashrc_el7() {
     log "Rewriting /etc/bashrc ..."
 
     local tmp_file=$( mktemp )
-    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" || true
     if [[ -s "${tmp_file}" ]] ; then
         cp -p /etc/bashrc /etc/bashrc.original
         mv -v "${tmp_file}" /etc/bashrc
diff --git a/snippets/tpl.210.bashrc-el8.sh b/snippets/tpl.210.bashrc-el8.sh
index 1ad7319..7338aac 100644
--- a/snippets/tpl.210.bashrc-el8.sh
+++ b/snippets/tpl.210.bashrc-el8.sh
@@ -15,7 +15,7 @@ set_bashrc_centos8() {
     log "Rewriting /etc/bashrc ..."
 
     local tmp_file=$( mktemp )
-    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" || true
     if [[ -s "${tmp_file}" ]] ; then
         cp -p /etc/bashrc /etc/bashrc.original
         mv -v "${tmp_file}" /etc/bashrc
diff --git a/snippets/tpl.211.bashrc-el9.sh b/snippets/tpl.211.bashrc-el9.sh
index 1ad7319..7338aac 100644
--- a/snippets/tpl.211.bashrc-el9.sh
+++ b/snippets/tpl.211.bashrc-el9.sh
@@ -15,7 +15,7 @@ set_bashrc_centos8() {
     log "Rewriting /etc/bashrc ..."
 
     local tmp_file=$( mktemp )
-    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" || true
     if [[ -s "${tmp_file}" ]] ; then
         cp -p /etc/bashrc /etc/bashrc.original
         mv -v "${tmp_file}" /etc/bashrc
diff --git a/snippets/tpl.225.vimrc-el7.sh b/snippets/tpl.225.vimrc-el7.sh
index 959c40d..8f5d0c1 100644
--- a/snippets/tpl.225.vimrc-el7.sh
+++ b/snippets/tpl.225.vimrc-el7.sh
@@ -15,7 +15,7 @@ set_vimrc_el7() {
     log "Rewriting /etc/vimrc ..."
 
     local tmp_file=$( mktemp )
-    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" || true
     if [[ -s "${tmp_file}" ]] ; then
         cp -p /etc/vimrc /etc/vimrc.original
         mv -v "${tmp_file}" /etc/vimrc
diff --git a/snippets/tpl.230.vimrc-el8.sh b/snippets/tpl.230.vimrc-el8.sh
index 7465739..7fcdf53 100644
--- a/snippets/tpl.230.vimrc-el8.sh
+++ b/snippets/tpl.230.vimrc-el8.sh
@@ -15,7 +15,7 @@ set_vimrc_centos8() {
     log "Rewriting /etc/vimrc ..."
 
     local tmp_file=$( mktemp )
-    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" || true
     if [[ -s "${tmp_file}" ]] ; then
         cp -p /etc/vimrc /etc/vimrc.original
         mv -v "${tmp_file}" /etc/vimrc
diff --git a/snippets/tpl.231.vimrc-el9.sh b/snippets/tpl.231.vimrc-el9.sh
index d2fedb9..e5ea9f1 100644
--- a/snippets/tpl.231.vimrc-el9.sh
+++ b/snippets/tpl.231.vimrc-el9.sh
@@ -15,7 +15,7 @@ set_vimrc_el9() {
     log "Writing /etc/vimrc.local ..."
 
     local tmp_file=$( mktemp )
-    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" || true
     if [[ -s "${tmp_file}" ]] ; then
         if [[ -f '/etc/vimrc.local' ]] ; then
             cp -p '/etc/vimrc.local' '/etc/vimrc.local.original'
diff --git a/snippets/tpl.300.create-motd.sh b/snippets/tpl.300.create-motd.sh
index 8059281..a128dd1 100644
--- a/snippets/tpl.300.create-motd.sh
+++ b/snippets/tpl.300.create-motd.sh
@@ -17,7 +17,7 @@ create_motd() {
     log "Creating initial /etc/motd ..."
 
     local mk_script=$( mktemp -p /tmp "mk_create_motd.XXXXXXXXXX.ksh" )
-    if curl -s -S -o "${mk_script}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
+    if curl -s -S -o "${mk_script}" --connect-timeout 3 --expect100-timeout 3 "${url}" ; then
         chmod 0755 "${mk_script}"
         "${mk_script}" > /etc/motd
         mkdir -pv /root/bin
diff --git a/snippets/tpl.470.postfix.sh b/snippets/tpl.470.postfix.sh
index bbbfa72..1395692 100644
--- a/snippets/tpl.470.postfix.sh
+++ b/snippets/tpl.470.postfix.sh
@@ -156,7 +156,7 @@ install_postfix() {
     echo "Getting new master.cf ..."
     url="${cobbler_url}/${ws_rel_filesdir}/${system_status}/postfix/master.cf"
     tmp_file=$( mktemp )
-    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" || true
     if [[ -s "${tmp_file}" ]] ; then
         mv -v "${tmp_file}" /etc/postfix/master.cf
     fi
@@ -165,7 +165,7 @@ install_postfix() {
     echo "Getting new virtuals ..."
     cp /dev/null "${tmp_file}"
     url="${cobbler_url}/${ws_rel_filesdir}/${system_status}/postfix/virtual"
-    curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" || true
+    curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" || true
     if [[ -s "${tmp_file}" ]] ; then
         mv -v "${tmp_file}" /etc/postfix/virtual
     fi
diff --git a/snippets/tpl.500.logrotate.sh b/snippets/tpl.500.logrotate.sh
index ef8eb6f..1946da9 100644
--- a/snippets/tpl.500.logrotate.sh
+++ b/snippets/tpl.500.logrotate.sh
@@ -21,7 +21,7 @@ config_logrotate() {
     local tgt="/etc/logrotate.conf"
 
     echo "Getting ${url} => ${tgt} ..."
-    if curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
+    if curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" ; then
         :
     else
         echo "[$(date)]: Could not get 'logrotate.conf' from '${url}'." | tee -a "${ERROR_POINTER}"
@@ -36,7 +36,7 @@ config_logrotate() {
         tgt="/etc/logrotate.d/${base}"
         cp -v /dev/null "${tmp_file}"
         echo "Getting ${url} => ${tgt} ..."
-        if curl -s -S -o "${tmp_file}" --connect-timeout=3 --expect100-timeout=3 "${url}" ; then
+        if curl -s -S -o "${tmp_file}" --connect-timeout 3 --expect100-timeout 3 "${url}" ; then
             :
         else
             echo "[$(date)]: Could not get '${base}' from '${url}'." | tee -a "${ERROR_POINTER}"
-- 
2.39.5