Browse Source

Update MKit to v0.0.36

Alois Mahdal 5 years ago
parent
commit
dfca061a70

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

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

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

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

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

126
     local inc                       # file to include
126
     local inc                       # file to include
127
     local incre='\[INCLUDE:.*\]'    # include directive regex
127
     local incre='\[INCLUDE:.*\]'    # include directive regex
128
     local iline                     # include directive line
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
         inc=${iline#*:}; inc=${inc%]}
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
     else
133
     else
134
         cat "$MKIT_INI"
134
         cat "$MKIT_INI"
135
     fi | __ini_grepcmt
135
     fi | __ini_grepcmt

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

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

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

86
 #
86
 #
87
 # This MKit version
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
     esac
686
     esac
687
     updating && init_from_existing
687
     updating && init_from_existing
688
     if test -n "$License"; then
688
     if test -n "$License"; then
689
-        known_licenses | grep -qxF "$License" \
689
+        known_licenses | grep -qxFe "$License" \
690
          || die "unknown license (use -L to get list): $License"
690
          || die "unknown license (use -L to get list): $License"
691
         MkLicense=true
691
         MkLicense=true
692
     fi
692
     fi