netvor
/
mkit
Watch 1
Star 0
Fork 0
Code Releases 35 Activity
Browse Source

Move global initialization to mkit_init()

Alois Mahdal 9 years ago
parent
dfb3fd3d69
commit
9e865c89b7
1 changed files with 2 additions and 1 deletions
Unified View Show Diff Stats
  1. 2
    1
      src/include/mkit.sh

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

32
32
33 
 MKIT_INI=${MKIT_INI:-mkit.ini}
 33 
 MKIT_INI=${MKIT_INI:-mkit.ini}
34 
 MKIT_INI_EXPAND=2
 34 
 MKIT_INI_EXPAND=2
35 
-MKIT_PROJ_PKGNAME=$(ini 1value "project:pkgname")
35 
+MKIT_PROJ_PKGNAME=""
36 
 MKIT_DEFAULT_MODE="644"
 36 
 MKIT_DEFAULT_MODE="644"
37
37
38 
 mkit_init() {
 38 
 mkit_init() {
41 
     #
 41 
     #
42 
     # Check for ini file and some variables
 42 
     # Check for ini file and some variables
43 
     #
 43 
     #
44 
+    MKIT_PROJ_PKGNAME=$(ini 1value "project:pkgname")
44 
     test -f "$MKIT_INI" || die "cannot find mkit.ini: $MKIT_INI"
 45 
     test -f "$MKIT_INI" || die "cannot find mkit.ini: $MKIT_INI"
45 
     test -n "$(tr -d '[:space:]' <<<"$MKIT_LOCAL")" \
 46 
     test -n "$(tr -d '[:space:]' <<<"$MKIT_LOCAL")" \
46 
      || die "MKIT_LOCAL must be non-blank: '$MKIT_LOCAL'"
 47 
      || die "MKIT_LOCAL must be non-blank: '$MKIT_LOCAL'"