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

kiss: fix install bug with multiple packages

Browse Source 
If a cp fails, the file's contents is still that of the previous
package. This ensures they are truncated where applicable.
This commit is contained in:
Dylan Araps 2021-07-05 13:47:45 +03:00
parent 9c89761268
commit 6ef9a98ee3
No known key found for this signature in database
GPG Key ID: 13295DAC2CF13B5C
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kiss
View File

@ -1204,7 +1204,7 @@ pkg_remove() {
fi fi
# Make a backup of the etcsums file (if it exists). # Make a backup of the etcsums file (if it exists).
cp -f "$sys_db/$1/etcsums" "$mak_dir/c" 2>/dev/null || : cp -f "$sys_db/$1/etcsums" "$mak_dir/c" 2>/dev/null || : > "$mak_dir/c"
log "$1" "Removing package" log "$1" "Removing package"
pkg_remove_files < "$sys_db/$1/manifest" pkg_remove_files < "$sys_db/$1/manifest"
@ -1320,8 +1320,10 @@ pkg_install() {
# If the package is already installed (and this is an upgrade) make a # If the package is already installed (and this is an upgrade) make a
# backup of the manifest and etcsums files. # backup of the manifest and etcsums files.
cp -f "$sys_db/$pkg_name/manifest" "$mak_dir/m" 2>/dev/null || : cp -f "$sys_db/$pkg_name/manifest" "$mak_dir/m" 2>/dev/null ||
cp -f "$sys_db/$pkg_name/etcsums" "$mak_dir/c" 2>/dev/null || : : > "$mak_dir/m"
cp -f "$sys_db/$pkg_name/etcsums" "$mak_dir/c" 2>/dev/null ||
: > "$mak_dir/c"
# Install the package's files by iterating over its manifest. # Install the package's files by iterating over its manifest.
pkg_install_files -z "$tar_dir/$pkg_name" pkg_install_files -z "$tar_dir/$pkg_name"