Browse Source

Simplify `yum_install*()` using `select_args()`

Alois Mahdal 11 years ago
parent
commit
df378d134e
1 changed files with 5 additions and 16 deletions
  1. 5
    16
      include/yummy.sh

+ 5
- 16
include/yummy.sh View File

131
     #
131
     #
132
     # Mindlessly and silently install anything
132
     # Mindlessly and silently install anything
133
     #
133
     #
134
-    local opts pkg pkgs
135
-    while true; do case $1 in
136
-        "") break ;;
137
-        -*) opts="$opts $1"; shift ;;
138
-        *)  pkgs="$pkgs $1"; shift ;;
139
-    esac done
140
-    for pkg in $pkgs;
141
-    do
142
-        yum -q -y $opts install "$pkgs" 2>&1 | mute_known yum
143
-    done
134
+    yum -q -y install "$@" 2>&1 | mute_known yum
144
 }
135
 }
145
 
136
 
146
 yum_install_if_needed() {
137
 yum_install_if_needed() {
147
     #
138
     #
148
     # yum_install unless it's already installed
139
     # yum_install unless it's already installed
149
     #
140
     #
150
-    local opts pkg pkgs
151
-    while true; do case $1 in
152
-        "") break ;;
153
-        -*) opts="$opts $1"; shift ;;
154
-        *)  pkgs="$pkgs $1"; shift ;;
155
-    esac done
141
+    local pkgs="$(select_args word $@)"
142
+    local opts="$(select_args opt $@)"
143
+    debug -v pkgs opts
156
     for pkg in $pkgs;
144
     for pkg in $pkgs;
157
     do
145
     do
146
+        debug "rpm -q $pkg >& /dev/null || yum_install $opts $pkg;"
158
         rpm -q $pkg >& /dev/null || yum_install $opts $pkg;
147
         rpm -q $pkg >& /dev/null || yum_install $opts $pkg;
159
     done
148
     done
160
 }
149
 }