From 26a98fdb095fcc1d3f7e044374846b98910f8e58 Mon Sep 17 00:00:00 2001 From: Lars Eidam Date: Tue, 28 Feb 2012 18:05:54 +0100 Subject: [PATCH] fix issue #10, MPATH with leading "./" are now working --- application/tests/CodeSniffer/cs-scripts.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) mode change 100755 => 100644 application/tests/CodeSniffer/cs-scripts.sh diff --git a/application/tests/CodeSniffer/cs-scripts.sh b/application/tests/CodeSniffer/cs-scripts.sh old mode 100755 new mode 100644 index 0a37222db..b6d2713aa --- a/application/tests/CodeSniffer/cs-scripts.sh +++ b/application/tests/CodeSniffer/cs-scripts.sh @@ -86,6 +86,8 @@ function cs-disable() { # on a submodule function cs-install-submodule() { return_value=0 + + # check if last letter is an "/", if not add a "/" at the end LASTLETTER=${1: -1} if [[ $LASTLETTER != "/" ]] then @@ -93,6 +95,14 @@ function cs-install-submodule() { else MPATH=$1 fi + + # check if first letters are "./", if so cut this letters + FIRSTLETTERS=${MPATH: 0: 2} + if [[ $FIRSTLETTERS == "./" ]] + then + MPATH=${MPATH: 2} + fi + BACKMPATH=${MPATH//[^\/]} BACKMPATH=${BACKMPATH//\//..\/} cs-install; @@ -111,6 +121,8 @@ function cs-install-submodule() { # on a submodule function cs-uninstall-submodule() { return_value=0 + + # check if last letter is an "/", if not add a "/" at the end LASTLETTER=${1: -1} if [[ $LASTLETTER != "/" ]] then @@ -118,6 +130,14 @@ function cs-uninstall-submodule() { else MPATH=$1 fi + + # check if first letters are "./", if so cut this letters + FIRSTLETTERS=${MPATH: 0: 2} + if [[ $FIRSTLETTERS == "./" ]] + then + MPATH=${MPATH: 2} + fi + echo -n " Do you really want to uninstall CodeSniffer for Submodule '$MPATH'? (y/n): " read CONFIRM; if [[ $CONFIRM == "y" ]]