Fix curl syntax errors

diff --git a/bin/postinst b/bin/postinst
index d15d34dee61e1ea5c277843118d827cf3e9657a9..bd412216e18bf6014db6bce2e19192be9fefb0d2 100644 (file)
--- 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 adc5d08bf4b4805b53dd24cffacab391ede5c9fa..caa661393433f6ef8b29540647ce52e7338e654f 100644 (file)
--- 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 d8ae8865a33c52e42368f0353adae788661582a0..58c7cce45277f24c4ea6ca9d3f4d9fc21ec2e1f8 100644 (file)
--- 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 ed0e41fe212edee5f113e1ac1f3c1dc95cc67456..d95fb9f45a8ecd73d2cb02fb24f28d79726a48aa 100644 (file)
--- 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 2128fad37c65fa01292fe2cd53087844b15d8703..ba193bbc10bfd4719d6d70012974e283fd923bd8 100644 (file)
--- 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 3cb232bb3aeb133a6a0005d1bb64a71244328b27..69689b9b8669d2130a5d4d250dd407ab9bee720d 100644 (file)
--- 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 647d71042d59f1c81e1041fb931bc17cc45d2ec4..85c7f95f4298231a5875daf5d4924e142d818c63 100644 (file)
--- 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 ffd5de4b2bac89cd22e0e2669a6f00eb346a2377..02cff8638a5f08177abe7f806ba634fb0a81ea89 100644 (file)
--- 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 e87b3b1b199f2c4c68f6771ae95dcb56a30b553f..07c5d113e5aedc9838f0069af67c34ce4a72ed96 100644 (file)
--- 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 1fb3ed492ecec6165360e686bdb267dd945f62a7..2db07d8e8ccc8b8554a7262a84834f25c3e09545 100644 (file)
--- 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 50561996b6cb4da6435a77a692d449e746ead001..101a171d008285b71892c5fec500bbc20228b9e1 100644 (file)
--- 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 4fa1695a4950ab48ddef55095cf5c598eccbaf26..a0e9c6d3c25fbaa0897e97c23130207af220410f 100644 (file)
--- 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 165c95380a78cef5772b3820854dd2729c67f370..96bb0c56b93f57eae6d00ad24f1751e0e0612bd1 100644 (file)
--- 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 252892b7a8c48d04091ba15d5511016addb4089e..97f272031b64c4f9c226319f1ee0ccb52f81440c 100644 (file)
--- 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 6b588a189a14437934c0e6649a0f0f017c2c901f..4e329a66d1fb6a1980dc24f47acbe61e04fe0568 100644 (file)
--- 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 37f3e92b2ea2401a547b1d39ca6c8accb569b50e..20347cb6af082fd13f8f162279f1ef98418005e1 100644 (file)
--- 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 3f16940e509d5f51218a99f741144bdf169874c5..8e654adab749d2e316a05e66bca3847ca8bb3116 100644 (file)
--- 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 3e8a13c1df996ede1b7d2e4335909a7a9667c422..c7785398cab31d60bfc7b70f60401b82ddee97b9 100644 (file)
--- 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 1ad73198d09a282d90229447c9a187e00f4cdb7d..7338aac455703d1ea0930c8bea13e544435d7ac4 100644 (file)
--- 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 1ad73198d09a282d90229447c9a187e00f4cdb7d..7338aac455703d1ea0930c8bea13e544435d7ac4 100644 (file)
--- 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 959c40d78ea0dd501c6e331b0f0b318a4161e98a..8f5d0c1ae57c165a45d0251f658f1e93c3746686 100644 (file)
--- 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 7465739130cc9408c920fb0e1210597a4bbb8720..7fcdf535923db3d92754917b3183c334411231d8 100644 (file)
--- 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 d2fedb93ab56774391de5da6cb1f5a56061c722a..e5ea9f1254a484554e77ae6d2ecd21808eb84a3a 100644 (file)
--- 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 8059281289336a17c661f54f021fc018f6580002..a128dd115fd7ddd23f6ffc61f635da4e00932fbc 100644 (file)
--- 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 bbbfa7240f2d1efac77bd3a0fa6c2436c0bb9bfa..13956927241c7da12bbb98fba479f7f4b5887e00 100644 (file)
--- 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 ef8eb6f62c942b82f3c029b805b0382f5007f0ae..1946da97b5062e6972edac498d24efee9dbb8cc0 100644 (file)
--- 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}"