Skip to content

Commit 9a09d17

Browse files
authored
Merge pull request #246 from gaelfoppolo/fix/numVersionFromPlist-spaces-in-path
Fix "The domain/default pair of (xxx, yyy) does not exist"
2 parents 7ad1c40 + a2a527a commit 9a09d17

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

sonar-swift-plugin/src/main/shell/run-sonar-swift.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ binaryNames=''; readParameter binaryNames 'sonar.coverage.binaryNames'
206206
# Get the path of plist file
207207
plistFile=`xcodebuild -showBuildSettings -project "${projectFile}" | grep -i 'PRODUCT_SETTINGS_PATH' -m 1 | sed 's/[ ]*PRODUCT_SETTINGS_PATH = //'`
208208
# Number version from plist if no sonar.projectVersion
209-
numVerionFromPlist=`defaults read ${plistFile} CFBundleShortVersionString`
209+
numVersionFromPlist=`defaults read "${plistFile}" CFBundleShortVersionString`
210210

211211
# Read destination simulator
212212
destinationSimulator=''; readParameter destinationSimulator 'sonar.swift.simulator'
@@ -254,7 +254,7 @@ if [ "$vflag" = "on" ]; then
254254
echo "Xcode project file is: $projectFile"
255255
echo "Xcode workspace file is: $workspaceFile"
256256
echo "Xcode application scheme is: $appScheme"
257-
echo "Number version from plist is: $numVerionFromPlist"
257+
echo "Number version from plist is: $numVersionFromPlist"
258258
if [ -n "$unittests" ]; then
259259
echo "Destination simulator is: $destinationSimulator"
260260
echo "Excluded paths from coverage are: $excludedPathsFromCoverage"
@@ -512,7 +512,7 @@ fi
512512
# The project version from properties file
513513
numVersionSonarRunner=''; readParameter numVersionSonarRunner 'sonar.projectVersion'
514514
if [ -z "$numVersionSonarRunner" -o "$numVersionSonarRunner" = " " ]; then
515-
numVersionSonarRunner=" --define sonar.projectVersion=$numVerionFromPlist"
515+
numVersionSonarRunner=" --define sonar.projectVersion=$numVersionFromPlist"
516516
else
517517
#if we have version number in properties file, we don't overide numVersion for sonar-runner/sonar-scanner command
518518
numVersionSonarRunner='';

0 commit comments

Comments
 (0)