]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
Merge branch 'nyov/wiki' into 'master'
authorRudolf Polzer <divverent@gmail.com>
Wed, 26 Nov 2014 11:52:16 +0000 (11:52 +0000)
committerRudolf Polzer <divverent@gmail.com>
Wed, 26 Nov 2014 11:52:16 +0000 (11:52 +0000)
Allow cloning wiki from './all'

This enables cloning the wiki by adding a `wiki.yes` file for `all`.

As the setup stands, it would require @divVerent to mirror the repo first at de.x.o before this can work.
(Alternatively re-enable gitlab as a valid location named `lab` and `./all update -l lab` to test or use it.)

See merge request !1

misc/tools/all/xonotic.subr

index 56c1418a7df7a9c3433024033bf6ea63ae1f1490..3aa15837fcee39af4d5baeff43e78d056d7a249a 100644 (file)
@@ -45,6 +45,10 @@ case "$cmd" in
                                        cleanqc=true
                                        shift
                                        ;;
+                               -qc)
+                                       cleanqc=true
+                                       shift
+                                       ;;
                                -r|-p)
                                        case "$1" in
                                                -p)
@@ -346,7 +350,7 @@ case "$cmd" in
                fi
                ;;
        help)
-               $ECHO "  $SELF compile [-c] [-r|-p] [-0] [sdl|glx|wgl|dedicated]"
+               $ECHO "  $SELF compile [-c] [-qc] [-r|-p] [-0] [sdl|glx|wgl|dedicated]"
                $ECHO "  $SELF update-maps"
                $ECHO "  $SELF run [sdl|glx|wgl|dedicated] options..."
                $ECHO "  $SELF compile-map mapname1 mapname2... (e.g. \"./all compile-map dance drain fuse\")"