File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -191,29 +191,20 @@ Function_Global_Main_install_dependent_packages () {
191191
192192 Function_Local_checkpkg () {
193193 local Var_Local_package Var_Local_installed_package Var_Local_installed_version
194- # Var_Local_installed_package=($(pacman -Q | getclm 1))
195- # Var_Local_installed_version=($(pacman -Q | getclm 2))
196194 readarray -t Var_Local_installed_package < <( pacman -Q | getclm 1)
197195 readarray -t Var_Local_installed_version < <( pacman -Q | getclm 2)
198196 for Var_Local_package in $( seq 0 $(( "${# Var_Local_installed_package[@]} " - 1 )) ) ; do
199197 if [[ " ${Var_Local_installed_package[${Var_Local_package}]} " = " ${1} " ]]; then
200- if [[ " ${Var_Local_installed_version[${Var_Local_package}]} " = $( pacman -Sp --print-format ' %v' --config " ${Var_Global_Wizard_Env_pacman_conf} " ${1} ) ]]; then
201- echo -n " true"
202- return 0
203- else
204- echo -n " false"
205- return 0
206- fi
198+ [[ " ${Var_Local_installed_version[${Var_Local_package}]} " = " $( pacman -Sp --print-format ' %v' --config " ${Var_Global_Wizard_Env_pacman_conf} " " ${1} " ) " ]] && return 0 || return 1
207199 fi
208200 done
209- echo -n " false"
210- return 0
201+ return 1
211202 }
212203 echo
213204 for Var_Local_package in " ${dependence[@]} " ; do
214205 msg " 依存パッケージ ${Var_Local_package} を確認しています..." " Checking dependency package ${Var_Local_package} ..."
215- if [[ $( Function_Local_checkpkg ${Var_Local_package} ) = false ]] ; then
216- Var_Global_missing_packages+=(${Var_Local_package} )
206+ if Function_Local_checkpkg " ${Var_Local_package} " ; then
207+ Var_Global_missing_packages+=(" ${Var_Local_package} " )
217208 fi
218209 done
219210 if [[ -n " ${Var_Global_missing_packages[*]} " ]]; then
You can’t perform that action at this time.
0 commit comments