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: fix issues with requiring root.

Browse Source
This commit is contained in:
Dylan Araps 2019-08-12 23:57:31 +00:00
parent 74645120ed
commit 4e3198eb3d
4 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
.travis.yml Normal file → Executable file
View File

0
LICENSE.md Normal file → Executable file
View File

0
README.md Normal file → Executable file
View File

29
kiss
View File

@ -133,7 +133,6 @@ pkg_sources() {
# belongs to. This avoid conflicts between two packages having a # belongs to. This avoid conflicts between two packages having a
# source of the same name. # source of the same name.
mkdir -p "$src_dir/$1" mkdir -p "$src_dir/$1"
chmod 1777 "$src_dir/$1"
cd "$src_dir/$1" cd "$src_dir/$1"
# Find the package's repository files. This needs to keep # Find the package's repository files. This needs to keep
@ -424,9 +423,11 @@ pkg_build() {
shift shift
# Install any pre-built binaries if they exist. # Install any pre-built binaries if they exist.
# This calls 'args' to inherit a root check and call
# to 'sudo' to elevate permissions.
[ -f "$bin_dir/$pkg#$version-$release.tar.gz" ] && { [ -f "$bin_dir/$pkg#$version-$release.tar.gz" ] && {
log "[$pkg]: Found pre-built binary." log "[$pkg]: Found pre-built binary, installing..."
pkg_install "$bin_dir/$pkg#$version-$release.tar.gz" args i "$bin_dir/$pkg#$version-$release.tar.gz"
continue continue
} }
@ -892,7 +893,14 @@ args() {
i|in|ins|inst|insta|instal|install) i|in|ins|inst|insta|instal|install)
shift shift
[ "$1" ] || die "'kiss install' requires an argument." [ "$1" ] || die "'kiss install' requires an argument."
root_check
# Rerun the script with 'sudo' if the user isn't root.
# Cheeky but 'sudo' can't be used on shell functions
# themselves.
[ "$(id -u)" != 0 ] && {
sudo KISS_PATH=$KISS_PATH kiss i "$@"
return
}
# Create a list of each package's dependencies. # Create a list of each package's dependencies.
for pkg; do for pkg; do
@ -918,7 +926,15 @@ args() {
r|re|rem|remo|remov|remove) r|re|rem|remo|remov|remove)
shift shift
[ "$1" ] || die "'kiss remove' requires an argument." [ "$1" ] || die "'kiss remove' requires an argument."
root_check
# Rerun the script with 'sudo' if the user isn't root.
# Cheeky but 'sudo' can't be used on shell functions
# themselves.
[ "$(id -u)" != 0 ] && {
sudo KISS_PATH=$KISS_PATH kiss r "$@"
return
}
log "Removing packages..." log "Removing packages..."
# Create a list of each package's dependencies. # Create a list of each package's dependencies.
@ -1063,9 +1079,6 @@ main() {
"${bin_dir:=$cac_dir/bin}" \ "${bin_dir:=$cac_dir/bin}" \
|| die "Couldn't create cache directories." || die "Couldn't create cache directories."
# Set sticky bit in the "permanent" directories so users can write to it.
chmod 1777 "$cac_dir" "$src_dir" "$bin_dir"
args "$@" args "$@"
} }