kiss-community/kiss
1
0
Fork 1
mirror of https://codeberg.org/kiss-community/kiss synced 2024-09-27 03:42:37 -06:00
Code Issues Wiki

kiss: sed is gone

Browse Source
This commit is contained in:
Dylan Araps 2021-07-19 18:53:01 +03:00
parent 6cbf35151b
commit be0ea0a881
No known key found for this signature in database
GPG Key ID: 13295DAC2CF13B5C
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
kiss
View File

@ -715,7 +715,7 @@ EOF
# Generate a new manifest as we may be the creator of the depends # Generate a new manifest as we may be the creator of the depends
# file. This could otherwise be implemented by inserting a line # file. This could otherwise be implemented by inserting a line
# at the correct place in the existing manifest. # at the correct place in the existing manifest.
pkg_manifest "${PWD##*/}" pkg_manifest "${PWD##*/}" "$pkg_dir"
} }
} }
@ -725,25 +725,27 @@ pkg_manifest() {
# packages, checking for package conflicts and for general debugging. # packages, checking for package conflicts and for general debugging.
log "$1" "Generating manifest" log "$1" "Generating manifest"
cd "${2:-$pkg_dir}/$1"
# Ensure manifest is added to manfiest. # Ensure manifest is added to manfiest.
: > "$PWD/$pkg_db/$1/manifest" : > "$2/$1/$pkg_db/$1/manifest"
# Ensure etcsums is added to manifest if /etc exists in package. # Ensure etcsums is added to manifest if /etc exists in package.
! [ -d "$PWD/etc" ] || : > "$PWD/$pkg_db/$1/etcsums" ! [ -d "$2/$1/etc" ] || : > "$2/$1/$pkg_db/$1/etcsums"
tmp_file "$1" manifest
# Create a list of all files and directories. Append '/' to the end of # Create a list of all files and directories. Append '/' to the end of
# directories so they can be easily filtered out later. Also filter out # directories so they can be easily filtered out later. Also filter out
# all libtool .la files and charset.alias. # all libtool .la files and charset.alias.
find . ! -path . -type d -exec printf '%s/\n' {} + \ find "$2/$1" ! -path "$2/$1" -type d -exec printf '%s/\n' {} + \
-o \( ! -type d -a ! -name \*.la -a ! -name charset.alias \) -print | -o \( ! -type d -a ! -name \*.la -a ! -name charset.alias \) -print |
# Sort the output in reverse. Directories appear after their contents. # Sort the output in reverse. Directories appear after their contents.
# Remove the first character in each line (./dir -> /dir) and sort -r > "$_tmp_file"
sort -r | sed ss.ss > "$PWD/$pkg_db/$1/manifest"
cd "$OLDPWD" # Remove the first character in each line (./dir -> /dir).
while read -r file; do
printf '%s\n' "${file#"$2/$1"}"
done < "$_tmp_file" > "$2/$1/$pkg_db/$1/manifest"
} }
pkg_manifest_validate() { pkg_manifest_validate() {
@ -900,7 +902,7 @@ pkg_build_all() {
! [ -f "$repo_dir/sources" ] || pkg_extract "$pkg" ! [ -f "$repo_dir/sources" ] || pkg_extract "$pkg"
pkg_build "$pkg" pkg_build "$pkg"
pkg_manifest "$pkg" pkg_manifest "$pkg" "$pkg_dir"
pkg_strip "$pkg" pkg_strip "$pkg"
cd "$pkg_dir/$pkg/$pkg_db/$pkg" cd "$pkg_dir/$pkg/$pkg_db/$pkg"