Explorar el Código

Move RELSRC and RELDST parameters to mkit.ini

Alois Mahdal hace 9 años
padre
commit
8c65327f70
Se han modificado 2 ficheros con 6 adiciones y 3 borrados
  1. 2
    0
      mkit.ini
  2. 4
    3
      src/include/release.sh

+ 2
- 0
mkit.ini Ver fichero

@@ -10,6 +10,8 @@
10 10
     name = Mkit
11 11
     pkgname = mkit
12 12
     tagline = simple install helper
13
+    relsrc = master
14
+    reldst = last
13 15
 
14 16
 [lists]
15 17
 

+ 4
- 3
src/include/release.sh Ver fichero

@@ -12,9 +12,10 @@ __die_if() {
12 12
              || die "cannot do this outside git repo"
13 13
             ;;
14 14
         norelbr)
15
+            local relsrc=$(ini 1value project:relsrc)
15 16
             __git_info curbranch \
16
-              | grep -qFx "$RELSRC" \
17
-             || die "you are not on RELSRC branch: $RELSRC"
17
+              | grep -qFx "$relsrc" \
18
+             || die "you are not on release source branch: $relsrc"
18 19
             ;;
19 20
         dirty)
20 21
             git diff --shortstat 2>/dev/null \
@@ -113,7 +114,7 @@ __release() {
113 114
     debug_var newtag
114 115
     $MKIT_DRY && return
115 116
     git tag -m "$MKIT_PROJ_NAME $newtag - $CODENAME" "$newtag"
116
-    git branch -f "$RELDST" "$newtag"
117
+    git branch -f "$(ini 1value project:reldst)" "$newtag"
117 118
 }
118 119
 
119 120
 __git_msg_vbump() {