Merge branch 'master' into recurring-activity-46

[civicrm-core.git] / tools / scripts / releaser / releaser

diff --git a/tools/scripts/releaser/releaser b/tools/scripts/releaser/releaser
index 2e9452316e148eabbe85bf48634c7f00310391c8..08238b5a80efda23e27ef6006c8baed59a653cd9 100755 (executable)
--- a/tools/scripts/releaser/releaser
+++ b/tools/scripts/releaser/releaser
@@ -57,7 +57,7 @@ function do_mk_project() {
     fi
   done
 
-  $cmd_gitify all "$git_base_url" "$workdir/$version/export" --l10n
+  $cmd_gitify all "$git_base_url" "$workdir/$version/export" --l10n --branch "$start_point" --skip-gencode
 }
 
 #################################################
@@ -173,8 +173,8 @@ function do_update() {
     cd $workdir/$version/export
     # create sql upgrade file
     tpl="CRM/Upgrade/Incremental/sql/$new_ver.mysql.tpl"
-    if [ -f tpl ]; then
-      echo "{* file to handle db changes in $new_ver during upgrade *}" >> $tpl
+    if [ ! -f $tpl ]; then
+      echo "{* file to handle db changes in $new_ver during upgrade *}" > $tpl
     fi
     # escape regex special chars
     arg=`echo "$version" | sed 's:[]\[\^\$\.\*\/]:\\\\&:g'`
@@ -200,7 +200,7 @@ function do_update() {
     fi
   else
     echo "No version entered. Aborting version update."
-  fi 
+  fi
 }
 
 #################################################