kiss-community/kiss
1
0
Fork 1
mirror of https://codeberg.org/kiss-community/kiss synced 2024-12-25 00:20:05 -07:00
Code Issues Wiki

kiss: drop -a/-o as XSI :(, other small change

Browse Source
This commit is contained in:
Dylan Araps 2020-09-25 18:15:33 +03:00
parent 506db9b469
commit 946adbd6f6
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kiss
View File

@ -926,6 +926,9 @@ pkg_install_files() {
sort "$2/$pkg_db/${2##*/}/manifest" | sort "$2/$pkg_db/${2##*/}/manifest" |
while read -r line; do while read -r line; do
[ -d "$KISS_ROOT/$line" ] &&
continue
rwx=$(ls -ld "$2/$line") oct='' b='' o=0 rwx=$(ls -ld "$2/$line") oct='' b='' o=0
# Convert the output of 'ls' (rwxrwx---) to octal. This is a # Convert the output of 'ls' (rwxrwx---) to octal. This is a
@ -947,17 +950,16 @@ pkg_install_files() {
# Copy files and create directories (preserving permissions). # Copy files and create directories (preserving permissions).
case $line in case $line in
/etc/?*[!/]) /etc/?*[!/])
test -d "$KISS_ROOT/$line" -o "$1" "$KISS_ROOT/$line" || test "$1" "$KISS_ROOT/$line" ||
pkg_etc_file "$2" "${line#/}" pkg_etc_file "$2" "${line#/}"
;; ;;
*/) */)
test -d "$KISS_ROOT/$line" || mkdir -m "$oct" "$KISS_ROOT/$line"
mkdir -m "$oct" "$KISS_ROOT/$line"
;; ;;
*) *)
test -d "$KISS_ROOT/$line" -o "$1" "$KISS_ROOT/$line" || { test "$1" "$KISS_ROOT/$line" || {
cp -fP "$2/$line" "$KISS_ROOT/$line" cp -fP "$2/$line" "$KISS_ROOT/$line"
# This prepends $b which represents sticky bit, # This prepends $b which represents sticky bit,
@ -991,15 +993,15 @@ pkg_remove_files() {
file=$KISS_ROOT/$file file=$KISS_ROOT/$file
# Remove files. # Remove files.
if test -f "$file" -a ! -h "$file"; then if [ -f "$file" ] && [ ! -h "$file" ]; then
rm -f "$file" rm -f "$file"
# Remove file symlinks. # Remove file symlinks.
elif test -h "$file" -a ! -d "$file"; then elif [ -h "$file" ] && [ ! -d "$file" ]; then
rm -f "$file" rm -f "$file"
# Remove directories if empty. # Remove directories if empty.
elif test -d "$file" -a ! -h "$file"; then elif [ -d "$file" ] && [ ! -h "$file" ]; then
rmdir "$file" 2>/dev/null ||: rmdir "$file" 2>/dev/null ||:
fi fi
done ||: done ||: