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

kiss: Allow full rootless use via KISS_ROOT

Browse Source
This commit is contained in:
Dylan Araps 2020-05-12 11:02:08 +03:00
parent f49e575b64
commit e049f468ec
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kiss
View File

@ -869,7 +869,7 @@ pkg_conflicts() {
# directory. # directory.
cd -P "${file%/*}" 2>/dev/null || PWD=${file%/*} cd -P "${file%/*}" 2>/dev/null || PWD=${file%/*}
printf '%s\n' "$PWD/${file##*/}" printf '%s\n' "${PWD#$KISS_ROOT}/${file##*/}"
cd "$old_PWD" cd "$old_PWD"
done < "$tar_dir/$1/$pkg_db/$1/manifest" > "$cac_dir/$pid-m" done < "$tar_dir/$1/$pkg_db/$1/manifest" > "$cac_dir/$pid-m"
@ -1490,7 +1490,7 @@ args() {
a|alternatives) a|alternatives)
# Rerun the script with 'su' if the user isn't root. # Rerun the script with 'su' if the user isn't root.
# Cheeky but 'su' can't be used on shell functions themselves. # Cheeky but 'su' can't be used on shell functions themselves.
[ -z "$1" ] || [ "$uid" = 0 ] || { [ -z "$1" ] || [ -w "$KISS_ROOT/" ] || [ "$uid" = 0 ] || {
as_root kiss "$action" "$@" as_root kiss "$action" "$@"
return return
} }
@ -1499,7 +1499,7 @@ args() {
i|install|r|remove) i|install|r|remove)
# Rerun the script with 'su' if the user isn't root. # Rerun the script with 'su' if the user isn't root.
# Cheeky but 'su' can't be used on shell functions themselves. # Cheeky but 'su' can't be used on shell functions themselves.
[ "$uid" = 0 ] || { [ -w "$KISS_ROOT/" ] || [ "$uid" = 0 ] || {
KISS_FORCE="$KISS_FORCE" as_root kiss "$action" "$@" KISS_FORCE="$KISS_FORCE" as_root kiss "$action" "$@"
return return
} }
@ -1673,9 +1673,13 @@ main() {
# break some operations. # break some operations.
KISS_ROOT=${KISS_ROOT%/} KISS_ROOT=${KISS_ROOT%/}
# Define this variable but don't create its directory structure from
# the get go. It will be created as needed by package installation.
sys_db=$KISS_ROOT/$pkg_db
# This allows for automatic setup of a KISS chroot and will # This allows for automatic setup of a KISS chroot and will
# do nothing on a normal system. # do nothing on a normal system.
mkdir -p "${sys_db:=$KISS_ROOT/}" 2>/dev/null ||: mkdir -p "$KISS_ROOT/" 2>/dev/null ||:
# Create the required temporary directories and set the variables # Create the required temporary directories and set the variables
# which point to them. # which point to them.