Browse Source

Update own dogfood

Alois Mahdal 7 years ago
parent
commit
227406021b
3 changed files with 4 additions and 4 deletions
  1. 1
    1
      utils/mkit/include/mkit.sh
  2. 1
    1
      utils/mkit/include/vars.sh
  3. 2
    2
      utils/mkit/stub

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

113
     ver_line=$(
113
     ver_line=$(
114
         {
114
         {
115
             head -3 "$MKIT_INI"
115
             head -3 "$MKIT_INI"
116
-            tac "$MKIT_INI" | tail -3
116
+            tail -3 "$MKIT_INI"
117
         } | grep -m 1 -E '^# *mkit +version *= *v?[0-9]+\.[0-9]+\.[0-9]+'
117
         } | grep -m 1 -E '^# *mkit +version *= *v?[0-9]+\.[0-9]+\.[0-9]+'
118
     )
118
     )
119
     test -n "$ver_line" \
119
     test -n "$ver_line" \

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

57
 #
57
 #
58
 # This MKit version
58
 # This MKit version
59
 #
59
 #
60
-MKIT_VERSION=0.0.21+HEAD.g47f8848
60
+MKIT_VERSION=0.0.22+master.gaafa785

+ 2
- 2
utils/mkit/stub View File

301
             echo " 1. Look for placeholders starting with \`MKIT_STUB_\`"
301
             echo " 1. Look for placeholders starting with \`MKIT_STUB_\`"
302
             echo "    prefix by calling this command:"
302
             echo "    prefix by calling this command:"
303
             echo ""
303
             echo ""
304
-            echo "        grep -lw MKIT_STUB_ -r"
304
+            echo "        grep -l MKIT_STUB_ -r"
305
             echo ""
305
             echo ""
306
             echo " 2. Go through each file and locate the placeholder.  (You"
306
             echo " 2. Go through each file and locate the placeholder.  (You"
307
             echo "    will also see placeholders like \`__MKIT_*__\`, you can"
307
             echo "    will also see placeholders like \`__MKIT_*__\`, you can"
660
         *)        usage ;;
660
         *)        usage ;;
661
     esac
661
     esac
662
     updating && init_from_existing
662
     updating && init_from_existing
663
-    if $MkLicense; then
663
+    if test -n $License; then
664
         known_licenses | grep -qxF "$License" \
664
         known_licenses | grep -qxF "$License" \
665
          || die "unknown license (use -L to get list): $License"
665
          || die "unknown license (use -L to get list): $License"
666
         MkLicense=true
666
         MkLicense=true