kiss new log format
This commit is contained in:
parent
837b43bed2
commit
8c75bd849d
23
kiss
23
kiss
|
@ -507,11 +507,11 @@ pkg_fix_deps() {
|
||||||
done ||:
|
done ||:
|
||||||
done |
|
done |
|
||||||
|
|
||||||
sort -uk1,1 depends - > "$mak_dir/.fixdeps"
|
sort -uk1,1 depends - > "$tmp_dir/.fixdeps"
|
||||||
|
|
||||||
diff -U 3 depends - < "$mak_dir/.fixdeps" ||:
|
diff -U 3 depends - < "$tmp_dir/.fixdeps" ||:
|
||||||
|
|
||||||
mv -f "$mak_dir/.fixdeps" depends
|
mv -f "$tmp_dir/.fixdeps" depends
|
||||||
|
|
||||||
if [ -s depends ]; then
|
if [ -s depends ]; then
|
||||||
pkg_manifest "${PWD##*/}"
|
pkg_manifest "${PWD##*/}"
|
||||||
|
@ -701,8 +701,8 @@ pkg_build() {
|
||||||
[ -d "$pkg_dir/$pkg/etc" ] && : > "$pkg_dir/$pkg/$pkg_db/$pkg/etcsums"
|
[ -d "$pkg_dir/$pkg/etc" ] && : > "$pkg_dir/$pkg/$pkg_db/$pkg/etcsums"
|
||||||
|
|
||||||
pkg_strip "$pkg"
|
pkg_strip "$pkg"
|
||||||
pkg_fix_deps "$pkg"
|
|
||||||
pkg_manifest "$pkg"
|
pkg_manifest "$pkg"
|
||||||
|
pkg_fix_deps "$pkg"
|
||||||
pkg_etcsums "$pkg"
|
pkg_etcsums "$pkg"
|
||||||
pkg_tar "$pkg"
|
pkg_tar "$pkg"
|
||||||
|
|
||||||
|
@ -1658,13 +1658,14 @@ main() {
|
||||||
# Create the required temporary directories and set the variables which
|
# Create the required temporary directories and set the variables which
|
||||||
# point to them.
|
# point to them.
|
||||||
mkdir -p \
|
mkdir -p \
|
||||||
"${cac_dir:=${XDG_CACHE_HOME:-${HOME:?HOME is NULL}/.cache}/kiss}" \
|
"${cac_dir:="${XDG_CACHE_HOME:-"${HOME:?HOME is null}/.cache"}/kiss"}" \
|
||||||
"${mak_dir:=${KISS_TMPDIR:=$cac_dir}/build-$pid}" \
|
"${src_dir:="$cac_dir/sources"}" \
|
||||||
"${pkg_dir:=${KISS_TMPDIR:=$cac_dir}/pkg-$pid}" \
|
"${log_dir:="$cac_dir/logs/${date%-*}"}" \
|
||||||
"${tar_dir:=${KISS_TMPDIR:=$cac_dir}/extract-$pid}" \
|
"${bin_dir:="$cac_dir/bin"}" \
|
||||||
"${src_dir:=$cac_dir/sources}" \
|
"${tmp_dir:="${KISS_TMPDIR:="$cac_dir/proc"}/$pid"}" \
|
||||||
"${log_dir:=$cac_dir/logs}" \
|
"${mak_dir:="$tmp_dir/build"}" \
|
||||||
"${bin_dir:=$cac_dir/bin}"
|
"${pkg_dir:="$tmp_dir/pkg"}" \
|
||||||
|
"${tar_dir:="$tmp_dir/extract"}"
|
||||||
|
|
||||||
args "$@"
|
args "$@"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue