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

kiss: Ensure all arguments sent to dosu are quoted

Browse Source
This commit is contained in:
Dylan Araps 2020-01-28 00:10:09 +02:00
parent 6fc8b89b82
commit 63b655bdf7
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kiss
View File

@ -804,9 +804,9 @@ pkg_remove() {
[ "${file##/etc/*}" ] || continue [ "${file##/etc/*}" ] || continue
if [ -d "$KISS_ROOT/$file" ]; then if [ -d "$KISS_ROOT/$file" ]; then
dosu rmdir "$KISS_ROOT/$file" 2>/dev/null || continue dosu rmdir "'$KISS_ROOT/$file'" 2>/dev/null || continue
else else
dosu rm -f "$KISS_ROOT/$file" dosu rm -f "'$KISS_ROOT/$file'"
fi fi
done < "$sys_db/$1/manifest" done < "$sys_db/$1/manifest"
@ -884,7 +884,7 @@ pkg_install() {
pkg_rsync() { pkg_rsync() {
dosu rsync --chown=root:root --chmod=Du-s,Dg-s,Do-s \ dosu rsync --chown=root:root --chmod=Du-s,Dg-s,Do-s \
-WhHKa --no-compress "$1" --exclude /etc \ -WhHKa --no-compress "$1" --exclude /etc \
"$tar_dir/$pkg_name/" "$KISS_ROOT/" "'$tar_dir/$pkg_name/'" "'$KISS_ROOT/'"
} }
# Install the package by using 'rsync' and overwrite any existing files # Install the package by using 'rsync' and overwrite any existing files
@ -894,7 +894,7 @@ pkg_install() {
# If '/etc/' exists in the package, install it but don't overwrite. # If '/etc/' exists in the package, install it but don't overwrite.
[ -d "$tar_dir/$pkg_name/etc" ] && [ -d "$tar_dir/$pkg_name/etc" ] &&
dosu rsync --chown=root:root -WhHKa --no-compress --ignore-existing \ dosu rsync --chown=root:root -WhHKa --no-compress --ignore-existing \
"$tar_dir/$pkg_name/etc" "$KISS_ROOT/" "'$tar_dir/$pkg_name/etc'" "'$KISS_ROOT/'"
# Remove any leftover files if this is an upgrade. # Remove any leftover files if this is an upgrade.
[ "$old_manifest" ] && { [ "$old_manifest" ] && {
@ -911,18 +911,18 @@ pkg_install() {
# Remove files. # Remove files.
if [ -f "$file" ] && [ ! -L "$file" ]; then if [ -f "$file" ] && [ ! -L "$file" ]; then
dosu rm -f "$file" dosu rm -f "'$file'"
# Remove file symlinks. # Remove file symlinks.
elif [ -L "$file" ] && [ ! -d "$file" ]; then elif [ -L "$file" ] && [ ! -d "$file" ]; then
dosu unlink "$file" ||: dosu unlink "'$file'" ||:
# Skip directory symlinks. # Skip directory symlinks.
elif [ -L "$file" ] && [ -d "$file" ]; then : elif [ -L "$file" ] && [ -d "$file" ]; then :
# Remove directories if empty. # Remove directories if empty.
elif [ -d "$file" ]; then elif [ -d "$file" ]; then
dosu rmdir "$file" 2>/dev/null ||: dosu rmdir "'$file'" 2>/dev/null ||:
fi fi
done ||: done ||:
} }
@ -938,7 +938,7 @@ pkg_install() {
if [ -x "$sys_db/$pkg_name/post-install" ]; then if [ -x "$sys_db/$pkg_name/post-install" ]; then
log "$pkg_name" "Running post-install script" log "$pkg_name" "Running post-install script"
dosu "$sys_db/$pkg_name/post-install" ||: dosu "'$sys_db/$pkg_name/post-install'" ||:
fi fi
log "$pkg_name" "Installed successfully" log "$pkg_name" "Installed successfully"