Browse Source

Update own dogfood

Alois Mahdal 9 years ago
parent
commit
a9663d2c28
3 changed files with 9 additions and 3 deletions
  1. 1
    0
      utils/mkit/include/build.sh
  2. 7
    2
      utils/mkit/include/deploy.sh
  3. 1
    1
      utils/mkit/make

+ 1
- 0
utils/mkit/include/build.sh View File

@@ -188,6 +188,7 @@ expand_variables() {
188 188
                     debug_var varname varvalue
189 189
                 done
190 190
         done
191
+        echo "s|__MKIT_PROJ_NAME__|$(ini 1value project:name)|;"
191 192
         echo "s|__MKIT_PROJ_CODENAME__|$(ini 1value project:codename)|;"
192 193
         echo "s|__MKIT_PROJ_PKGNAME__|$(ini 1value project:pkgname)|;"
193 194
         echo "s|__MKIT_PROJ_TAGLINE__|$(ini 1value project:tagline)|;"

+ 7
- 2
utils/mkit/include/deploy.sh View File

@@ -69,8 +69,13 @@ get_root() {
69 69
     #
70 70
     local grp="$1"
71 71
     local root=$(ini 1value "roots:$grp")
72
-    test -n "$root" || die "missing in config.ini: roots:$grp"
73
-    echo "$(ini 1value ENV:DESTDIR)$root"
72
+    local destdir=$(ini 1value ENV:DESTDIR)
73
+    destdir=${destdir%/}
74
+    case $destdir:$root in
75
+        *:)     die "missing in config.ini: roots:$grp" ;;
76
+        :*)     echo "$root" ;;
77
+        *:*)    echo "$destdir/$root" ;;
78
+    esac
74 79
 }
75 80
 
76 81
 install() {

+ 1
- 1
utils/mkit/make View File

@@ -6,7 +6,7 @@ die() {
6 6
     echo "$@" && exit 9
7 7
 }
8 8
 
9
-export MKIT_VERSION=0.0.10+devel.gd450a45
9
+export MKIT_VERSION=0.0.11+devel.gda0869d
10 10
 
11 11
 export MKIT_DIR=${MKIT_DIR:-$(dirname "$0")}
12 12
 export MKIT_LOCAL=${MKIT_LOCAL:-.mkit}