diff --git a/Scripts/Bash/Functions/Verify/verify_getActions.sh b/Scripts/Bash/Functions/Verify/verify_getActions.sh index 0806d45..7170d98 100755 --- a/Scripts/Bash/Functions/Verify/verify_getActions.sh +++ b/Scripts/Bash/Functions/Verify/verify_getActions.sh @@ -28,7 +28,7 @@ function verify_getActions { case $OPTIONNAM in --packages ) - verify_getPackages + verify_requiredPackages ;; --paths ) diff --git a/Scripts/Bash/Functions/Verify/verify_getPackages.sh b/Scripts/Bash/Functions/Verify/verify_getPackages.sh deleted file mode 100644 index 776092a..0000000 --- a/Scripts/Bash/Functions/Verify/verify_getPackages.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash -# -# verify_getPackages.sh -- This function queries your system's -# rpm database to verify centos-art.sh required packages existence. -# If there is any missing package, leave a message and quit script -# execution. -# -# Copyright (C) 2009-2010 Alain Reguera Delgado -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA. -# -# ---------------------------------------------------------------------- -# $Id$ -# ---------------------------------------------------------------------- - -function verify_getPackages { - - # Define variables as local to avoid conflicts outside. - local PACKAGE='' - local PACKAGES='' - local PACKAGE_INFO='' - - # Define required packages needed by centos-art.sh script. - PACKAGES="bash inkscape ImageMagick netpbm netpbm-progs - syslinux gimp coreutils texinfo info tetex-latex tetex-fonts - tetex-doc tetex-xdvi tetex-dvips gettext texi2html" - - # Define, from required packages, packages being from third - # parties (i.e., packages not included in rhel, nor centos [base] - # repository.). - PACKAGES_FROM_THIRDS="(inkscape|blender)" - - # Output table of packages needed by centos-art.sh script. - rpm -q --queryformat "%{NAME}: %{SUMMARY}\n" $PACKAGES \ - | egrep -i $REGEX - - cli_printMessage "$(caller)" "AsToKnowMoreLine" -} diff --git a/Scripts/Bash/Functions/Verify/verify_requiredPackages.sh b/Scripts/Bash/Functions/Verify/verify_requiredPackages.sh new file mode 100644 index 0000000..5675cfd --- /dev/null +++ b/Scripts/Bash/Functions/Verify/verify_requiredPackages.sh @@ -0,0 +1,51 @@ +#!/bin/bash +# +# verify_requiredPackages.sh -- This function queries your system's +# rpm database to verify centos-art.sh required packages existence. +# If there is any missing package, leave a message and quit script +# execution. +# +# Copyright (C) 2009-2010 Alain Reguera Delgado +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. +# +# ---------------------------------------------------------------------- +# $Id$ +# ---------------------------------------------------------------------- + +function verify_requiredPackages { + + # Define variables as local to avoid conflicts outside. + local PACKAGE='' + local PACKAGES='' + local PACKAGE_INFO='' + + # Define required packages needed by centos-art.sh script. + PACKAGES="bash inkscape ImageMagick netpbm netpbm-progs + syslinux gimp coreutils texinfo info tetex-latex tetex-fonts + tetex-doc tetex-xdvi tetex-dvips gettext texi2html" + + # Define, from required packages, packages being from third + # parties (i.e., packages not included in rhel, nor centos [base] + # repository.). + PACKAGES_FROM_THIRDS="(inkscape|blender)" + + # Output table of packages needed by centos-art.sh script. + rpm -q --queryformat "%{NAME}: %{SUMMARY}\n" $PACKAGES \ + | egrep -i $REGEX + + cli_printMessage "$(caller)" "AsToKnowMoreLine" +}