Przeglądaj źródła

Update own dogfood

Alois Mahdal 6 lat temu
rodzic
commit
c43cdb4238

+ 9
- 5
utils/mkit/include/build.sh Wyświetl plik

@@ -47,15 +47,19 @@ __expand_line() {
47 47
     local line=$1   # line to process
48 48
     local mname     # macro name
49 49
     local mvline    # line of macro value
50
+    local xline     # expanded line
51
+    xline=$line
50 52
     for mname in "${!MacroMap[@]}"; do
51 53
         if ! test "${line//$mname}" == "$line"; then
52
-            while IFS= read -r mvline; do
53
-                echo "${line//$mname/$mvline}"
54
-            done <<<"${MacroMap[$mname]}"
55
-            return 0
54
+            xline=$(
55
+                while IFS= read -r mvline; do
56
+                    echo "${line//$mname/$mvline}"
57
+                done <<<"${MacroMap[$mname]}"
58
+            )
56 59
         fi
60
+        line=$xline
57 61
     done
58
-    echo "$line"
62
+    echo "$xline"
59 63
     return 1
60 64
 }
61 65
 

+ 0
- 1
utils/mkit/include/ini.sh Wyświetl plik

@@ -79,7 +79,6 @@ __ini_grepsec() {
79 79
     local ok=false      # are we in the section?
80 80
     local line          # each input line
81 81
     grep '.' \
82
-      | grep -v '\s*#' \
83 82
       | while read -r line; do
84 83
             case "$line" in
85 84
                 \[$wnt\]) ok=true;  continue ;;

+ 1
- 1
utils/mkit/include/vars.sh Wyświetl plik

@@ -58,4 +58,4 @@ MKIT_PROJ_PKGNAME=""
58 58
 #
59 59
 # This MKit version
60 60
 #
61
-MKIT_VERSION=0.0.29+HEAD.g0ada671
61
+MKIT_VERSION=0.0.31+master.g5676fda