From 4bab81bcf0fc19e385d5b3569f29eade00e47515 Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: Dec 22 2010 15:50:49 +0000 Subject: Rename cli_checkActionArguments.sh to cli_checkRepoDirSource.sh. --- diff --git a/Scripts/Bash/Functions/cli_checkActionArguments.sh b/Scripts/Bash/Functions/cli_checkActionArguments.sh deleted file mode 100755 index 2fa5698..0000000 --- a/Scripts/Bash/Functions/cli_checkActionArguments.sh +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash -# -# cli_checkRepoDirSource.sh -- This function provides input validation -# to repository entries considered as source locations. -# -# 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 cli_checkRepoDirSource { - - # Check source value before making an absolute path from it. - if [[ $ACTIONVAL =~ '(\.\.(/)?)' ]];then - cli_printMessage "`gettext "The path provided can't be processed."`" 'AsErrorLine' - cli_printMessage "$(caller)" "AsToKnowMoreLine" - fi - if [[ ! $ACTIONVAL =~ '^[A-Za-z0-9\.:/-]+$' ]];then - cli_printMessage "`gettext "The path provided can't be processed."`" 'AsErrorLine' - cli_printMessage "$(caller)" "AsToKnowMoreLine" - fi - - # Redefine source value to build repository absolute path from - # repository top level on. As we are removing - # /home/centos/artwork/ from all centos-art.sh output (in order to - # save horizontal output space), we need to be sure that all - # strings begining with trunk/..., branches/..., and tags/... use - # the correct absolute path. That is, you can refer trunk's - # entries using both /home/centos/artwork/trunk/... or just - # trunk/..., the /home/centos/artwork/ part is automatically added - # here. - if [[ $ACTIONVAL =~ '^(trunk|branches|tags)' ]];then - ACTIONVAL=/home/centos/artwork/$ACTIONVAL - fi - - # Re-define source value to build repository absolute path from - # repository relative paths. This let us to pass repository - # relative paths as source value. Passing relative paths as - # source value may save us some typing; specially if we are stood - # a few levels up from the location we want to refer to as source - # value. There is no need to pass the absolute path to it, just - # refere it relatively. - if [[ -d ${ACTIONVAL} ]];then - - # Add directory to the top of the directory stack. - pushd "$ACTIONVAL" > /dev/null - - # Check directory existence inside the repository. - if [[ $(pwd) =~ '^/home/centos/artwork' ]];then - # Re-define source value using absolute path. - ACTIONVAL=$(pwd) - else - cli_printMessage "`gettext "The location provided is not valid."`" 'AsErrorLine' - cli_printMessage "$(caller)" 'AsToKnowMoreLine' - fi - - # Remove directory from the directory stack. - popd > /dev/null - - elif [[ -f ${ACTIONVAL} ]];then - - # Add directory to the top of the directory stack. - pushd "$(dirname $ACTIONVAL)" > /dev/null - - # Check directory existence inside the repository. - if [[ $(pwd) =~ '^/home/centos/artwork' ]];then - # Re-define source value using absolute path. - ACTIONVAL=$(pwd)/$(basename $ACTIONVAL) - else - cli_printMessage "`gettext "The location provided is not valid."`" 'AsErrorLine' - cli_printMessage "$(caller)" 'AsToKnowMoreLine' - fi - - # Remove directory from the directory stack. - popd > /dev/null - - elif [[ ${ACTIONVAL} =~ '^(https|http)://' ]];then - - # At this point files and directories have been discarded. - # Take care of repository urls. - if [[ ! ${ACTIONVAL} =~ '^(https|http)://projects.centos.org/svn/artwork/.+$' ]];then - cli_printMessage "`gettext "The location provided is not valid exists."`" 'AsErrorLine' - cli_printMessage "$(caller)" 'AsToKnowMoreLine' - fi - - else - - # At this there is no existent working copy entry, nor a valid - # url. The source value can only be considered as such if it - # is an existent working copy or valid url. So, print a - # message and stop script execution. - cli_printMessage "`gettext "The location provided is not valid exists."`" 'AsErrorLine' - cli_printMessage "$(caller)" 'AsToKnowMoreLine' - - fi - -} diff --git a/Scripts/Bash/Functions/cli_checkRepoDirSource.sh b/Scripts/Bash/Functions/cli_checkRepoDirSource.sh new file mode 100755 index 0000000..2fa5698 --- /dev/null +++ b/Scripts/Bash/Functions/cli_checkRepoDirSource.sh @@ -0,0 +1,113 @@ +#!/bin/bash +# +# cli_checkRepoDirSource.sh -- This function provides input validation +# to repository entries considered as source locations. +# +# 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 cli_checkRepoDirSource { + + # Check source value before making an absolute path from it. + if [[ $ACTIONVAL =~ '(\.\.(/)?)' ]];then + cli_printMessage "`gettext "The path provided can't be processed."`" 'AsErrorLine' + cli_printMessage "$(caller)" "AsToKnowMoreLine" + fi + if [[ ! $ACTIONVAL =~ '^[A-Za-z0-9\.:/-]+$' ]];then + cli_printMessage "`gettext "The path provided can't be processed."`" 'AsErrorLine' + cli_printMessage "$(caller)" "AsToKnowMoreLine" + fi + + # Redefine source value to build repository absolute path from + # repository top level on. As we are removing + # /home/centos/artwork/ from all centos-art.sh output (in order to + # save horizontal output space), we need to be sure that all + # strings begining with trunk/..., branches/..., and tags/... use + # the correct absolute path. That is, you can refer trunk's + # entries using both /home/centos/artwork/trunk/... or just + # trunk/..., the /home/centos/artwork/ part is automatically added + # here. + if [[ $ACTIONVAL =~ '^(trunk|branches|tags)' ]];then + ACTIONVAL=/home/centos/artwork/$ACTIONVAL + fi + + # Re-define source value to build repository absolute path from + # repository relative paths. This let us to pass repository + # relative paths as source value. Passing relative paths as + # source value may save us some typing; specially if we are stood + # a few levels up from the location we want to refer to as source + # value. There is no need to pass the absolute path to it, just + # refere it relatively. + if [[ -d ${ACTIONVAL} ]];then + + # Add directory to the top of the directory stack. + pushd "$ACTIONVAL" > /dev/null + + # Check directory existence inside the repository. + if [[ $(pwd) =~ '^/home/centos/artwork' ]];then + # Re-define source value using absolute path. + ACTIONVAL=$(pwd) + else + cli_printMessage "`gettext "The location provided is not valid."`" 'AsErrorLine' + cli_printMessage "$(caller)" 'AsToKnowMoreLine' + fi + + # Remove directory from the directory stack. + popd > /dev/null + + elif [[ -f ${ACTIONVAL} ]];then + + # Add directory to the top of the directory stack. + pushd "$(dirname $ACTIONVAL)" > /dev/null + + # Check directory existence inside the repository. + if [[ $(pwd) =~ '^/home/centos/artwork' ]];then + # Re-define source value using absolute path. + ACTIONVAL=$(pwd)/$(basename $ACTIONVAL) + else + cli_printMessage "`gettext "The location provided is not valid."`" 'AsErrorLine' + cli_printMessage "$(caller)" 'AsToKnowMoreLine' + fi + + # Remove directory from the directory stack. + popd > /dev/null + + elif [[ ${ACTIONVAL} =~ '^(https|http)://' ]];then + + # At this point files and directories have been discarded. + # Take care of repository urls. + if [[ ! ${ACTIONVAL} =~ '^(https|http)://projects.centos.org/svn/artwork/.+$' ]];then + cli_printMessage "`gettext "The location provided is not valid exists."`" 'AsErrorLine' + cli_printMessage "$(caller)" 'AsToKnowMoreLine' + fi + + else + + # At this there is no existent working copy entry, nor a valid + # url. The source value can only be considered as such if it + # is an existent working copy or valid url. So, print a + # message and stop script execution. + cli_printMessage "`gettext "The location provided is not valid exists."`" 'AsErrorLine' + cli_printMessage "$(caller)" 'AsToKnowMoreLine' + + fi + +}