Browse code

Make -c flag -cs option for fetch. Make build aware of it. Clarify usage once more.

Nat! authored on 10-10-2016 13:43:17
Showing 4 changed files
... ...
@@ -1,3 +1,10 @@
1
+2.1.2
2
+===
3
+
4
+* expose some more flags to usage. Distinguish between flags and options.
5
+* The description of -V was wrong.
6
+* Moved -c to fetch options as -cs to avoid clash with build flags
7
+
1 8
 2.1.1
2 9
 ===
3 10
 
... ...
@@ -19,7 +26,7 @@ specify the subdirectory like "src/embedded/foo" (relative to project root).
19 26
 
20 27
 Better fetch and build code checks that dependencies, that are
21 28
 installed in `/usr/local` already, need not be fetched again. This can
22
-be helpful, when building brew packages (for example).
29
+be helpful, when building brew packages (for example). (**-nb**)
23 30
 
24 31
 Support for `mulle-build` which has an in general more optimistic approach to
25 32
 life. 2.2 will focus on making operations faster in the Windows bash shell.
... ...
@@ -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.1.1"
32
+MULLE_BOOTSTRAP_VERSION="2.1.2"
33 33
 
34 34
 #
35 35
 # This is the main user interface to mulle-bootstrap
... ...
@@ -45,13 +45,12 @@ trap_fail()
45 45
 usage()
46 46
 {
47 47
    cat <<EOF
48
-usage: mulle-bootstrap [options] [command] ...
49
- Options:
48
+usage: mulle-bootstrap [flags] [command] [options]
49
+ Flags:
50 50
    -a -y     : default answer to questions (scripts wont be checked)
51 51
                -a (clone preferred) -y (local copy/symlink preferred)
52 52
    -n        : do nothing creative or destructive
53 53
    -v        : -v to be more verbose (-vv or -vvv for more verbosity)
54
-   -V        : show build commands
55 54
 
56 55
  Commands:
57 56
    bootstrap : does fetch and build recursively [default]
... ...
@@ -64,6 +63,8 @@ usage: mulle-bootstrap [options] [command] ...
64 63
    git       : run git commands on fetched repositories
65 64
    tag       : tag fetched repositories
66 65
    update    : updates repositories (pull).
66
+
67
+ Options are command specific. Use mulle-bootstrap <command> -h for help.
67 68
 EOF
68 69
 
69 70
    if [ "${UNAME}" = 'darwin' ]
... ...
@@ -195,10 +196,6 @@ bootstrap_main()
195 196
             MULLE_BOOTSTRAP_ANSWER="YES"
196 197
          ;;
197 198
 
198
-         -c|--check-usr-local-include)
199
-            MULLE_BOOTSTRAP_CHECK_USR_LOCAL_INCLUDE="YES"
200
-         ;;
201
-
202 199
          -f|--force-fetch)
203 200
             MULLE_BOOTSTRAP_DIRTY_HARRY="NO"
204 201
          ;;
... ...
@@ -2278,7 +2278,7 @@ build_main()
2278 2278
             ;;
2279 2279
 
2280 2280
          # fetch options
2281
-         -nr|--no-recursion|-e|--embedded-only|-u|--update-symlinks)
2281
+         -cs|--check-usr-local-include|-nr|--no-recursion|-e|--embedded-only|-u|--update-symlinks)
2282 2282
             if [ -z "${MULLE_BOOTSTRAP_DID_FETCH}" ]
2283 2283
             then
2284 2284
                log_error "unknown option $1"
... ...
@@ -45,9 +45,10 @@ usage:
45 45
    mulle-bootstrap ${COMMAND} [options] [repositories]
46 46
 
47 47
    Options
48
-      -u    :  try to update symlinked folders as well (not recommended)
49
-      -nr   :  ignore .bootstrap folders of fetched repositories
48
+      -cs   :  check /usr/local for duplicates
50 49
       -e    :  fetch embedded repositories only
50
+      -nr   :  ignore .bootstrap folders of fetched repositories
51
+      -u    :  try to update symlinked folders as well (not recommended)
51 52
 
52 53
    install  :  clone or symlink non-exisiting repositories and other resources
53 54
    update   :  execute a "pull" in fetched repositories
... ...
@@ -1326,6 +1327,10 @@ _common_main()
1326 1327
             DONT_RECURSE="YES"
1327 1328
          ;;
1328 1329
 
1330
+         -cs|--check-usr-local-include)
1331
+            MULLE_BOOTSTRAP_CHECK_USR_LOCAL_INCLUDE="YES"
1332
+         ;;
1333
+
1329 1334
          -e|--embedded-only)
1330 1335
             EMBEDDED_ONLY="YES"
1331 1336
          ;;