bonsai/kiss
3
0
Fork 0
forked from kiss-community/kiss
Code Issues 2 Pull Requests Projects Releases Activity

kiss: simplify fixdeps

Browse Source
This commit is contained in:
Dylan Araps 2020-03-23 12:40:38 +02:00
parent 7f22697bdc
commit 811808f881
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
kiss
View File

@ -387,24 +387,17 @@ pkg_fixdeps() {
# simplify path building. # simplify path building.
cd "$pkg_dir/$1/$pkg_db/$1" cd "$pkg_dir/$1/$pkg_db/$1"
# Make a copy of the depends file if it exists to have a
# reference to 'diff' against.
if [ -f depends ]; then
cp -f depends "$mak_dir/d"
dep_file=$mak_dir/d
else
dep_file=/dev/null
fi
# Generate a list of all installed manifests. # Generate a list of all installed manifests.
pkg_name=$1 set +f; set -f -- "$sys_db/"*/manifest
set +f
set -f -- "$sys_db/"*/manifest # Cat the current depends file if it exists as we will append
# detected dependencies to it.
{ cat depends 2>/dev/null ||:
# Get a list of binaries and libraries, false files # Get a list of binaries and libraries, false files
# will be found, however it's faster to get 'ldd' to check # will be found, however it's faster to get 'ldd' to check
# them anyway than to filter them out. # them anyway than to filter them out.
find "$pkg_dir/$pkg_name/" -type f 2>/dev/null | find "$pkg_dir/${PWD##*/}/" -type f 2>/dev/null |
while read -r file; do while read -r file; do
# Run 'ldd' on the file and parse each line. The code # Run 'ldd' on the file and parse each line. The code
@ -428,21 +421,16 @@ pkg_fixdeps() {
case $dep in case $dep in
# Skip listing these packages as dependencies. # Skip listing these packages as dependencies.
musl|gcc|${PWD##*/}|"") ;; musl|gcc|${PWD##*/}|"") ;;
*) printf '%s\n' "$dep" ;; *) printf '%s\n' "$dep"
printf 'Found %s\n' "$dep" >/dev/tty
esac esac
done ||: done ||:
done >> depends done } |
# Remove duplicate entries from the new depends file. # Sort the list and remove duplicates. Generate a diff between the
# This removes duplicate lines looking *only* at the # original dependencies and the new dependencies. Finally, apply the
# first column. # patch directly to the depends file.
sort -uk1,1 -o depends depends 2>/dev/null ||: sort -uk1,1 | diff - depends 2>/dev/null | patch -Rp1 ||:
# Display a diff of the new dependencies against the old ones.
diff "$dep_file" depends 2>/dev/null ||:
# Remove the depends file if it is empty.
[ -s depends ] || rm -f depends
} }
pkg_manifest() ( pkg_manifest() (