Browse code

fix two bugs now need a release branch

Nat! authored on 22-09-2016 18:45:24
Showing 4 changed files
... ...
@@ -1,3 +1,12 @@
1
+2.0.1
2
+===
3
+
4
+Fixes two bugs
5
+
6
+* fix problem in refresh using '==' instead of '='
7
+* fix cut not using -s for extra parameters
8
+
9
+
1 10
 2.0
2 11
 ===
3 12
 
... ...
@@ -29,7 +29,7 @@
29 29
 #   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31 31
 
32
-MULLE_BOOTSTRAP_VERSION="2.0"
32
+MULLE_BOOTSTRAP_VERSION="2.0.1"
33 33
 
34 34
 #
35 35
 # This is the main user interface to mulle-bootstrap
... ...
@@ -29,13 +29,21 @@ git_must_be_clean()
29 29
 set -e
30 30
 
31 31
 git_must_be_clean
32
-git push public master
32
+
33
+branch="`git rev-parse --abbrev-ref HEAD`"
34
+
35
+git checkout release
36
+git rebase "${branch}"
37
+git push public release
33 38
 
34 39
 # seperate step, as it's tedious to remove tag when
35 40
 # previous push fails
36 41
 
37 42
 git tag "${TAG}"
38
-git push public master --tags
43
+git push public release --tags
44
+
45
+git checkout "${branch}"
46
+
39 47
 
40 48
 ./generate-brew-formula.sh  > ../homebrew-software/mulle-bootstrap.rb
41 49
 (
... ...
@@ -725,19 +725,19 @@ url_from_clone()
725 725
 
726 726
 _name_part_from_clone()
727 727
 {
728
-   echo "$@" | cut '-d;' -f 2
728
+   echo "$@" | cut -s '-d;' -f 2
729 729
 }
730 730
 
731 731
 
732 732
 _branch_part_from_clone()
733 733
 {
734
-   echo "$@" | cut '-d;' -f 3
734
+   echo "$@" | cut -s '-d;' -f 3
735 735
 }
736 736
 
737 737
 
738 738
 _scm_part_from_clone()
739 739
 {
740
-   echo "$@" | cut '-d;' -f 4
740
+   echo "$@" | cut -s '-d;' -f 4
741 741
 }
742 742
 
743 743