root
/
sonarqube
mirror of https://github.com/SonarSource/sonarqube.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Variables should be local to each function to avoid clashing in the global namespace. 

Signed-off-by: Sébastien Lesaint <sebastien.lesaint@sonarsource.com>
This commit is contained in:
Patrice Clement 2016-07-26 11:02:28 +02:00 committed by Sébastien Lesaint
parent 7e603f7846
commit 81c8363c09
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/property_utils.sh
View File

@ -9,14 +9,14 @@
set -euo pipefail
function cnt_lines() {
FILE=$1
local FILE=$1
cat $FILE | wc -l
}
function write_prop() {
PROPERTY=$1
VALUE=$2
FILE=$3
local PROPERTY=$1
local VALUE=$2
local FILE=$3
# uncomment below to help debug calls to set_property
#echo "setting property $PROPERTY to value $VALUE in $FILE"
@ -26,11 +26,11 @@ function write_prop() {
}
function set_property() {
PROPERTY=$1
VALUE=$2
FILE=$3
local PROPERTY=$1
local VALUE=$2
local FILE=$3
REGEXP="${PROPERTY//\./\\.}\\s*="
local REGEXP="${PROPERTY//\./\\.}\\s*="
if grep -q "$REGEXP" "$FILE"; then
# delete line of specified property
@ -43,7 +43,7 @@ function set_property() {
fi
# add property if at least one line deleted
NEW_LINE_COUNT=$(cnt_lines $FILE)
local NEW_LINE_COUNT=$(cnt_lines $FILE)
if [[ $LINE_COUNT -gt $NEW_LINE_COUNT ]]; then
write_prop $PROPERTY $VALUE $FILE
@ -53,5 +53,3 @@ function set_property() {
write_prop $PROPERTY $VALUE $FILE
fi
}