Parcourir la source

Use rec_built() instead of manual steps

Alois Mahdal il y a 7 ans
Parent
révision
04ac52b348
1 fichiers modifiés avec 5 ajouts et 8 suppressions
  1. 5
    8
      src/include/build.sh

+ 5
- 8
src/include/build.sh Voir le fichier

@@ -17,8 +17,7 @@ _build1() {
17 17
     test -n "$ftype"    || ftype=$(_guess_ftype "$dstpath")
18 18
     debug_var srcpath dstpath ftype
19 19
     <"$srcpath" _build1_ftype "$ftype" >"$dstpath"
20
-    mkdir -p "$MKIT_LOCAL"
21
-    echo "$dstpath" >> "$MKIT_LOCAL/built.lst"
20
+    rec_built "$dstpath"
22 21
 }
23 22
 
24 23
 _build1_ftype() {
@@ -137,8 +136,7 @@ build_manpages() {
137 136
           | while read -r manfile; do
138 137
                 mdfile="$manfile.md"
139 138
                 ronn -r "$mdfile"
140
-                mkdir -p "$MKIT_LOCAL"
141
-                echo "$manfile" >> "$MKIT_LOCAL/built.lst"
139
+                rec_built "$manfile"
142 140
             done
143 141
     else
144 142
         echo "ronn is not installed"
@@ -174,7 +172,7 @@ debstuff() {
174 172
     mv "${MKIT_PROJ_PKGNAME}-$version.tar.gz" \
175 173
        "${MKIT_PROJ_PKGNAME}_$version.orig.tar.gz" \
176 174
      || die "could not rename tarball"
177
-    echo "${MKIT_PROJ_PKGNAME}_$version.orig.tar.gz" >> "$MKIT_LOCAL/built.lst"
175
+    rec_built "${MKIT_PROJ_PKGNAME}_$version.orig.tar.gz"
178 176
 
179 177
     # read content of each mandatory file from debian_skel
180 178
     #
@@ -188,7 +186,7 @@ debstuff() {
188 186
             mkdir -p "$(dirname "$dftgt")"
189 187
             _build1 "$dfsrc" "$dftgt" debstuff
190 188
         done
191
-    echo debian >> "$MKIT_LOCAL/built.lst"
189
+    rec_built debian
192 190
 }
193 191
 
194 192
 dist() {
@@ -211,8 +209,7 @@ dist() {
211 209
     echo -n "$git_lasthash" > "$dirname/.mkit/git_lasthash"
212 210
     tar -cf "$dirname.tar" "$dirname"
213 211
     gzip -f "$dirname.tar"      # see above FIXME
214
-    mkdir -p "$MKIT_LOCAL"
215
-    echo "$dirname.tar.gz" >> "$MKIT_LOCAL/built.lst"
212
+    rec_built "$dirname.tar.gz"
216 213
     rm -rf "$dirname"
217 214
 }
218 215