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

Merge branch 'master' into kiss-fix-cd

Browse Source
This commit is contained in:
dylan 2020-04-26 09:06:41 +03:00 committed by GitHub
commit d7e251ef02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kiss
View File

@ -832,7 +832,7 @@ pkg_install_files() {
*) test "$1" "$KISS_ROOT/$line" || *) test "$1" "$KISS_ROOT/$line" ||
if [ -L "$2/$line" ]; then if [ -h "$2/$line" ]; then
[ -d "$KISS_ROOT/$line" ] && continue [ -d "$KISS_ROOT/$line" ] && continue
cp -fPp "$2/$line" "${line%/*}" cp -fPp "$2/$line" "${line%/*}"
@ -1005,9 +1005,9 @@ pkg_install() {
# each file and directory inside of it actually exists. # each file and directory inside of it actually exists.
[ "$KISS_FORCE" = 1 ] || { [ "$KISS_FORCE" = 1 ] || {
log "$pkg_name" "Checking that manifest is valid" log "$pkg_name" "Checking that manifest is valid"
while read -r line; do while read -r line; do
[ -L "$tar_dir/$pkg_name/$line" ] || [ -h "$tar_dir/$pkg_name/$line" ] ||
[ -e "$tar_dir/$pkg_name/$line" ] || [ -e "$tar_dir/$pkg_name/$line" ] ||
die "File $line missing from tarball but mentioned in manifest" die "File $line missing from tarball but mentioned in manifest"
done < "$tar_dir/$pkg_name/$pkg_db/$pkg_name/manifest" done < "$tar_dir/$pkg_name/$pkg_db/$pkg_name/manifest"
@ -1063,15 +1063,15 @@ pkg_install() {
case $file in /etc/*) continue; esac case $file in /etc/*) continue; esac
# Remove files. # Remove files.
if [ -f "$file" ] && [ ! -L "$file" ]; then if [ -f "$file" ] && [ ! -h "$file" ]; then
rm -f "$file" rm -f "$file"
# Remove file symlinks. # Remove file symlinks.
elif [ -L "$file" ] && [ ! -d "$file" ]; then elif [ -h "$file" ] && [ ! -d "$file" ]; then
unlink "$file" ||: unlink "$file" ||:
# Skip directory symlinks. # Skip directory symlinks.
elif [ -L "$file" ] && [ -d "$file" ]; then : elif [ -h "$file" ] && [ -d "$file" ]; then :
# Remove directories if empty. # Remove directories if empty.
elif [ -d "$file" ]; then elif [ -d "$file" ]; then