Browse code

fix tar/zip update error

Nat! authored on 05-07-2017 17:14:25
Showing 5 changed files
... ...
@@ -1,10 +1,13 @@
1
+### 3.8.3
2
+
3
+* fix upgrade and status for tar/zip SCM, which previously errored out
4
+
1 5
 ### 3.8.2
2 6
 
3 7
 * fix setting listings for os specific settings and build settings
4 8
 in general
5 9
 * fix reading of dispense settings
6 10
 
7
-
8 11
 ### 3.8.1
9 12
 
10 13
 * fix archive extraction on linux
... ...
@@ -3,7 +3,7 @@
3 3
 # formula operations.
4 4
 #
5 5
 PROJECT="mulle-bootstrap"      # your project/repository name
6
-DESC="👢 Cross platform dependency manager - using bash and cmake"
6
+DESC="👢 Cross platform dependency manager for developers"
7 7
 LANGUAGE="bash"                # c,cpp, objc, bash ...
8 8
 # NAME="${PROJECT}"        # formula filename without .rb extension
9 9
 
... ...
@@ -31,7 +31,7 @@
31 31
 #
32 32
 MULLE_EXECUTABLE_VERSION_MAJOR=3
33 33
 MULLE_EXECUTABLE_VERSION_MINOR=8
34
-MULLE_EXECUTABLE_VERSION_PATCH=2
34
+MULLE_EXECUTABLE_VERSION_PATCH=3
35 35
 
36 36
 MULLE_EXECUTABLE_VERSION="${MULLE_EXECUTABLE_VERSION_MAJOR}.${MULLE_EXECUTABLE_VERSION_MINOR}.${MULLE_EXECUTABLE_VERSION_PATCH}"
37 37
 
... ...
@@ -480,10 +480,14 @@ clone_or_symlink()
480 480
    local scmflagsdefault
481 481
 
482 482
    case "${scm}" in
483
-      git*)
483
+      git)
484 484
          operation="git_clone"
485 485
       ;;
486 486
 
487
+      svn)
488
+         operation="svn_checkout"
489
+      ;;
490
+
487 491
       zip*)
488 492
          operation="zip_unpack"
489 493
       ;;
... ...
@@ -492,10 +496,6 @@ clone_or_symlink()
492 496
          operation="tar_unpack"
493 497
       ;;
494 498
 
495
-      svn*)
496
-         operation="svn_checkout"
497
-      ;;
498
-
499 499
       *)
500 500
          fail "Unknown scm system \"${scm}\""
501 501
       ;;
... ...
@@ -685,6 +685,10 @@ checkout_repository()
685 685
       svn)
686 686
          operation="svn_checkout"
687 687
       ;;
688
+      zip*|tar*)
689
+         log_info "No checkout for \"${scm}\""
690
+         return
691
+      ;;
688 692
       *)
689 693
          fail "Unknown scm system \"${scm}\""
690 694
       ;;
... ...
@@ -722,7 +726,8 @@ update_repository()
722 726
       git)
723 727
          operation="git_fetch"
724 728
       ;;
725
-      svn)
729
+      svn|zip*|tar*)
730
+         log_info "No update for \"${scm}\""
726 731
          return
727 732
       ;;
728 733
       *)
... ...
@@ -762,7 +767,8 @@ upgrade_repository()
762 767
       git)
763 768
          operation="git_pull"
764 769
       ;;
765
-      svn)
770
+      svn|zip*|tar*)
771
+         log_info "No upgrade for \"${scm}\""
766 772
          return
767 773
       ;;
768 774
       *)
... ...
@@ -68,12 +68,18 @@ _status_repository()
68 68
    if [ "${STATUS_SCM}" = "YES" ]
69 69
    then
70 70
       case "${scm}" in
71
-      git|"" )
71
+      git)
72 72
          git_status "$@" >&2
73 73
       ;;
74
+
74 75
       svn)
75 76
          svn_status "$@" >&2
76 77
       ;;
78
+
79
+      zip*|tar*)
80
+         log_verbose "No status for ${scm}"
81
+      ;;
82
+
77 83
       *)
78 84
          fail "Unknown scm system ${scm}"
79 85
       ;;