fix setting build options (which were erased during tests)

NatronGitHub · Apr 2, 2021 · 699faa2 · 699faa2
1 parent 3b6dbea
commit 699faa2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tools/jenkins/checkout-repository.sh b/tools/jenkins/checkout-repository.sh
@@ -63,7 +63,7 @@ function checkoutRepository() {
         rm -rf "$SRC_DIR_NAME"
     fi
 
-    if [ -n "$REPO_COMMIT" ]; then
+    if [ -n "$REPO_COMMIT" ] && [ -n "$COMMIT_BUILD_OPTION_NAME" ]; then
         setBuildOption "$COMMIT_BUILD_OPTION_NAME" "$REPO_COMMIT"
     fi
 

diff --git a/tools/jenkins/manageBuildOptions.sh b/tools/jenkins/manageBuildOptions.sh
@@ -39,7 +39,7 @@ function updateBuildOptions() {
 
 # Set a build option in the build option file so it can be retrieved at different places
 function setBuildOption() {
-    $GSED -e "s/${1//\//\\/}=.*/${1//\//\\/}=${2//\//\\/}/" --in-place "$BUILD_OPTIONS_FILE"
+    $GSED -e "s/^ *${1//\//\\/}=.*/${1//\//\\/}=${2//\//\\/}/" --in-place "$BUILD_OPTIONS_FILE"
 }
 
 function dumpBuildOptions() {