Browse Source

Move static project meta-data outside ENV

Alois Mahdal 9 years ago
parent
commit
5f274b43c9
3 changed files with 8 additions and 3 deletions
  1. 5
    0
      mkit.ini
  2. 1
    1
      src/include/build.sh
  3. 2
    2
      src/include/mkit.sh

+ 5
- 0
mkit.ini View File

@@ -5,6 +5,11 @@
5 5
     PROJNAME = Mkit
6 6
     PREFIX = utils
7 7
 
8
+[project]
9
+
10
+    name = Mkit
11
+    pkgname = mkit
12
+
8 13
 [lists]
9 14
 
10 15
     group = bin

+ 1
- 1
src/include/build.sh View File

@@ -107,7 +107,7 @@ rpmstuff() {
107 107
     #
108 108
     # Build specfile
109 109
     #
110
-    local specname="$(ini 1value ENV:PKGNAME).spec"
110
+    local specname="$MKIT_PROJ_PKGNAME.spec"
111 111
     local specsrc="$(ini 1value "rpmstuff:spec_skel")"
112 112
     test -n "$specsrc" || die "rpmstuff:spec_skel not specified"
113 113
     test -f "$specsrc" || die "specfile template not found: $specsrc"

+ 2
- 2
src/include/mkit.sh View File

@@ -32,8 +32,8 @@ debug_var() {
32 32
 
33 33
 MKIT_INI=${MKIT_INI:-mkit.ini}
34 34
 MKIT_INI_EXPAND=2
35
-MKIT_PROJ_NAME=$(ini 1value "ENV:PROJNAME")
36
-MKIT_PROJ_PKGNAME=$(ini 1value "ENV:PKGNAME")
35
+MKIT_PROJ_NAME=$(ini 1value "project:name")
36
+MKIT_PROJ_PKGNAME=$(ini 1value "project:pkgname")
37 37
 MKIT_DEFAULT_MODE="644"
38 38
 
39 39
 mkit_init() {