Fix #396 rsaccounting yum install (#397)

radiasoft · Oct 18, 2023 · 5c9807a · 5c9807a
1 parent 30ba364
commit 5c9807a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/rsconf/component/rsaccounting.py b/rsconf/component/rsaccounting.py
@@ -25,11 +25,6 @@ def internal_build_compile(self):
         from rsconf.component import docker_registry
 
         self.buildt.require_component("nginx")
-        # much newer than centos 7 version
-        v = "rclone-1.64.0-1"
-        self.append_root_bash(
-            f"rsconf_yum_install_url {v} https://downloads.rclone.org/v1.64.0/{v}-linux-amd64.rpm"
-        )
         jc, z = self.j2_ctx_init()
         z._run_u = jc.rsconf_db.run_u
         self.__run_d = systemd.docker_unit_prepare(

diff --git a/rsconf/package_data/rsconf/rsconf.sh b/rsconf/package_data/rsconf/rsconf.sh
@@ -617,14 +617,8 @@ rsconf_yum_install() {
             todo+=( "$x" )
         fi
     done
-    declare cmd="${rsconf_yum_install_cmd:-install}"
-    if [[ ! $cmd =~ ^((re)?install|downgrade)$ ]]; then
-        install_err "unexpected value rsconf_yum_install_cmd=$cmd"
-    fi
     if (( ${#todo[@]} > 0 )); then
-        if ! yum "$cmd" --color=never -y -q "${todo[@]}"; then
-            install_err "FAILED: yum $cmd ${todo[*]}";
-        fi
+        _rsconf_yum_install "${todo[@]}"
     fi
 }
 
@@ -634,7 +628,18 @@ rsconf_yum_install_url() {
     if rpm -q "$base" >& /dev/null; then
         return
     fi
-    rsconf_yum_install "$url"
+    _rsconf_yum_install "$url"
+}
+
+_rsconf_yum_install() {
+    declare todo=( "$@" )
+    declare cmd="${rsconf_yum_install_cmd:-install}"
+    if [[ ! $cmd =~ ^((re)?install|downgrade)$ ]]; then
+        install_err "unexpected value rsconf_yum_install_cmd=$cmd"
+    fi
+    if ! yum "$cmd" --color=never -y -q "${todo[@]}"; then
+        install_err "FAILED: yum $cmd ${todo[*]}";
+    fi
 }
 
 rsconf_main ${install_extra_args[@]+"${install_extra_args[@]}"}