From d47704a7b6adfb3fbea104b7520d070db88387de Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: Feb 17 2011 17:23:37 +0000 Subject: Update path functionality to move up syncronization of changes to _getActions functionality. --- diff --git a/Scripts/Bash/Functions/Path/path_doCopy.sh b/Scripts/Bash/Functions/Path/path_doCopy.sh index 6152dd6..b49cb66 100755 --- a/Scripts/Bash/Functions/Path/path_doCopy.sh +++ b/Scripts/Bash/Functions/Path/path_doCopy.sh @@ -56,14 +56,6 @@ function path_doCopy { . /home/centos/bin/centos-art render --copy="$ACTIONVAL" --to="$FLAG_TO" . /home/centos/bin/centos-art locale --copy="$ACTIONVAL" --to="$FLAG_TO" - # Syncronize changes from working copy to central repository. - cli_commitRepoChanges "$ACTIONVAL $FLAG_TO $(cli_getRepoParallelDirs "$FLAG_TO")" - - else - - # Syncronize changes from working copy to central repository. - cli_commitRepoChanges "$ACTIONVAL $FLAG_TO" - fi } diff --git a/Scripts/Bash/Functions/Path/path_doDelete.sh b/Scripts/Bash/Functions/Path/path_doDelete.sh index 6105d75..fad8ce4 100755 --- a/Scripts/Bash/Functions/Path/path_doDelete.sh +++ b/Scripts/Bash/Functions/Path/path_doDelete.sh @@ -43,7 +43,4 @@ function path_doDelete { # Perform action. svn del ${ACTIONVAL} --quiet - # Syncronize changes between working copy and central repository. - cli_commitRepoChanges "$ACTIONVAL $(cli_getRepoParallelDirs "$ACTIONVAL")" - } diff --git a/Scripts/Bash/Functions/Path/path_getActions.sh b/Scripts/Bash/Functions/Path/path_getActions.sh index 0e9edf3..7504f68 100755 --- a/Scripts/Bash/Functions/Path/path_getActions.sh +++ b/Scripts/Bash/Functions/Path/path_getActions.sh @@ -30,7 +30,7 @@ function path_getActions { local ARGSS="" # Define long options we want to support. - local ARGSL="copy:,move:,delete:,to:,quiet,sync,yes" + local ARGSL="copy:,move:,delete:,to:,sync" # Parse arguments using getopt(1) command parser. cli_doParseArguments @@ -88,24 +88,6 @@ function path_getActions { shift 1 ;; - --quiet ) - - # Redefine verbosity flag. - FLAG_QUIET='true' - - # Rotate positional parameters. - shift 1 - ;; - - --yes ) - - # Redefine answer flag. - FLAG_YES='true' - - # Rotate positional parameters. - shift 1 - ;; - * ) # Break options loop. break @@ -116,6 +98,10 @@ function path_getActions { # using source directory definition as reference. cli_checkRepoDirSource + # Syncronize changes between the working copy and the central + # repository to bring down changes. + cli_commitRepoChanges "${ACTIOVAL} ${FLAG_TO}" + # Execute action name. if [[ $ACTIONNAM =~ "^${FUNCNAM}_[A-Za-z]+$" ]];then eval $ACTIONNAM @@ -124,4 +110,8 @@ function path_getActions { cli_printMessage "$(caller)" 'AsToKnowMoreLine' fi + # Syncronize changes between the working copy and the central + # repository to commit up changes. + cli_commitRepoChanges "${ACTIOVAL} ${FLAG_TO}" + }