Browse Source

Use better qualified global names

Make it clear what's related to the packaged project.
Alois Mahdal 9 years ago
parent
commit
c8e285db22
3 changed files with 4 additions and 4 deletions
  1. 1
    1
      src/include/build.sh
  2. 2
    2
      src/include/mkit.sh
  3. 1
    1
      src/include/release.sh

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

92
     #       rpmstuff, hence -f hack for gzip
92
     #       rpmstuff, hence -f hack for gzip
93
     #
93
     #
94
     local version=$(get_version)
94
     local version=$(get_version)
95
-    local dirname=$MKIT_PKGNAME-$version
95
+    local dirname=$MKIT_PROJ_PKGNAME-$version
96
     mkdir -p "$dirname"
96
     mkdir -p "$dirname"
97
     ini values "lists:dist" | xargs -I DIST_ITEM cp -R DIST_ITEM "$dirname"
97
     ini values "lists:dist" | xargs -I DIST_ITEM cp -R DIST_ITEM "$dirname"
98
     sed -i -e "s/^VERSION = .*/VERSION = $version/" "$dirname/config.mk"
98
     sed -i -e "s/^VERSION = .*/VERSION = $version/" "$dirname/config.mk"

+ 2
- 2
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_PKGNAME=$(ini 1value "ENV:PKGNAME")
36
-MKIT_PROJNAME=$(ini 1value "ENV:PROJNAME")
35
+MKIT_PROJ_NAME=$(ini 1value "ENV:PROJNAME")
36
+MKIT_PROJ_PKGNAME=$(ini 1value "ENV:PKGNAME")
37
 MKIT_DEFAULT_MODE="644"
37
 MKIT_DEFAULT_MODE="644"
38
 
38
 
39
 mkit_init() {
39
 mkit_init() {

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

112
     set -e
112
     set -e
113
     debug_var newtag
113
     debug_var newtag
114
     $MKIT_DRY && return
114
     $MKIT_DRY && return
115
-    git tag -m "$MKIT_PROJNAME $newtag - $CODENAME" "$newtag"
115
+    git tag -m "$MKIT_PROJ_NAME $newtag - $CODENAME" "$newtag"
116
     git branch -f "$RELDST" "$newtag"
116
     git branch -f "$RELDST" "$newtag"
117
 }
117
 }
118
 
118