Browse Source

Update MKit to v0.0.36

Alois Mahdal 6 years ago
parent
commit
dfca061a70

+ 1
- 1
utils/mkit/include/deploy.sh View File

@@ -35,7 +35,7 @@ __deploy_item() {
35 35
         find "$src" -type f \
36 36
           | while read -r item; do
37 37
                 [[ $item =~ .skel$ ]] \
38
-                 && grep -q "${item%.skel}" "$MKIT_LOCAL/built.lst" \
38
+                 && grep -qe "${item%.skel}" "$MKIT_LOCAL/built.lst" \
39 39
                  && continue
40 40
                 __deploy_item "$item" "$dst${item#$src}" "$mode"
41 41
             done

+ 1
- 1
utils/mkit/include/facts.sh View File

@@ -55,7 +55,7 @@ git_fact() {
55 55
             git log -1 --pretty=format:%h HEAD
56 56
             ;;
57 57
         latest_cdate)
58
-            git log -1 --format=%cd --date=unix HEAD
58
+            git log -1 --format=%ct HEAD
59 59
             ;;
60 60
         *)
61 61
             warn "unknown git fact asked: $fact_name"

+ 3
- 3
utils/mkit/include/ini.sh View File

@@ -126,10 +126,10 @@ __ini_body() {
126 126
     local inc                       # file to include
127 127
     local incre='\[INCLUDE:.*\]'    # include directive regex
128 128
     local iline                     # include directive line
129
-    if iline=$(grep -m1 -x "$incre" "$MKIT_INI"); then
129
+    if iline=$(grep -m1 -xe "$incre" "$MKIT_INI"); then
130 130
         inc=${iline#*:}; inc=${inc%]}
131
-        grep -vx "$incre" "$inc"
132
-        grep -vx "$incre" "$MKIT_INI"
131
+        grep -vxe "$incre" "$inc"
132
+        grep -vxe "$incre" "$MKIT_INI"
133 133
     else
134 134
         cat "$MKIT_INI"
135 135
     fi | __ini_grepcmt

+ 2
- 2
utils/mkit/include/release.sh View File

@@ -44,7 +44,7 @@ __relck() {
44 44
         at_relsrc)
45 45
             oracle=$(ini 1value project:relsrc)
46 46
             git_fact current_branch \
47
-              | grep -qFx "$oracle" \
47
+              | grep -qFxe "$oracle" \
48 48
              || die "you are not on release source branch: $oracle"
49 49
             ;;
50 50
         not_dirty)
@@ -70,7 +70,7 @@ __relck() {
70 70
         ini_version)
71 71
             oracle=$(git_fact latest_version | __bump_version "$rlevel")
72 72
             ini 1value project:version  \
73
-              | grep -qFx "$oracle" \
73
+              | grep -qFxe "$oracle" \
74 74
              || die "new version not in mkit.ini: $oracle"
75 75
             ;;
76 76
         *)

+ 1
- 1
utils/mkit/include/vars.sh View File

@@ -86,4 +86,4 @@ MKIT_TTAG=${MKIT_TTAG:-ctime}
86 86
 #
87 87
 # This MKit version
88 88
 #
89
-MKIT_VERSION=0.0.34
89
+MKIT_VERSION=0.0.36

+ 1
- 1
utils/mkit/stub View File

@@ -686,7 +686,7 @@ main() {
686 686
     esac
687 687
     updating && init_from_existing
688 688
     if test -n "$License"; then
689
-        known_licenses | grep -qxF "$License" \
689
+        known_licenses | grep -qxFe "$License" \
690 690
          || die "unknown license (use -L to get list): $License"
691 691
         MkLicense=true
692 692
     fi