From edc7d9c1985e2577a2d67022099a2c63fef10972 Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: Dec 22 2010 18:17:09 +0000 Subject: Update license functionality: - Add GPL-short - Add license_doRead.sh - Add license_getActions.sh - Prepare license.sh to use the convenctional script flow (license, license_getActions, license_doRead). --- diff --git a/Scripts/Bash/Functions/License/GPL-short b/Scripts/Bash/Functions/License/GPL-short new file mode 100644 index 0000000..5ade5fc --- /dev/null +++ b/Scripts/Bash/Functions/License/GPL-short @@ -0,0 +1,14 @@ +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. diff --git a/Scripts/Bash/Functions/License/license.sh b/Scripts/Bash/Functions/License/license.sh index b15dc81..158298c 100755 --- a/Scripts/Bash/Functions/License/license.sh +++ b/Scripts/Bash/Functions/License/license.sh @@ -25,23 +25,7 @@ function license { - local CLILICENSE='' - - # Define command-line information. - CLILICENSE="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." - - # Build license message. - CLILICENSE="$CLINAME ($CLIVERSION) $CLIDESCRIP - - $CLICOPYRIGHT - - $CLILICENSE" - - # Output license message. - cli_printMessage "$CLILICENSE" "AsHeadingLine" + # Define command-line interface. + license_getActions } diff --git a/Scripts/Bash/Functions/License/license_doRead.sh b/Scripts/Bash/Functions/License/license_doRead.sh new file mode 100755 index 0000000..6afb5a6 --- /dev/null +++ b/Scripts/Bash/Functions/License/license_doRead.sh @@ -0,0 +1,47 @@ +#!/bin/bash +# +# license_doRead.sh -- This function provide the interface to read +# license information. +# +# 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: license_doRead.sh 538 2010-11-26 11:12:33Z al $ +# ---------------------------------------------------------------------- + + +function license_doRead { + + local GPL_LARGE="/home/centos/artwork/trunk/Scripts/Bash/Functions/License/GPL" + local GPL_SHORT="/home/centos/artwork/trunk/Scripts/Bash/Functions/License/GPL-short" + + # Build license message. + local CLILICENSE="$CLINAME ($CLIVERSION) -- $CLIDESCRIP + + $CLICOPYRIGHT + + $(cat $GPL_SHORT)" + + # Output brief license message. + cli_printMessage "$CLILICENSE" "AsHeadingLine" + + # Output full license message. + cli_printMessage "`gettext "Do you want to read the full license?"`" 'AsYesOrNoRequestLine' + less $GPL_LARGE + +} diff --git a/Scripts/Bash/Functions/License/license_getActions.sh b/Scripts/Bash/Functions/License/license_getActions.sh new file mode 100755 index 0000000..73717f1 --- /dev/null +++ b/Scripts/Bash/Functions/License/license_getActions.sh @@ -0,0 +1,44 @@ +#!/bin/bash +# +# license_getActions.sh -- This function initializes license +# functionalities, using the action value of centos-art.sh script as +# reference. +# +# 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: license_getActions.sh 538 2010-11-26 11:12:33Z al $ +# ---------------------------------------------------------------------- + +function license_getActions { + + # Evaluate action name and define which actions does centos-art.sh + # script supports. + case $ACTIONNAM in + + '--read' ) + license_doRead + ;; + + * ) + cli_printMessage "`gettext "The option provided is not valid."`" 'AsErrorLine' + ;; + + esac + +}