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

kiss: fix cache

Browse Source
This commit is contained in:
Dylan Araps 2020-01-27 23:46:26 +02:00
parent 3962f64385
commit fd892ccd7b
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kiss
View File

@ -77,22 +77,18 @@ root_cache() {
# by the user. The below commands read from '/dev/tty' to ensure # by the user. The below commands read from '/dev/tty' to ensure
# they work when run from a subshell. # they work when run from a subshell.
stty -F /dev/tty -echo stty -F /dev/tty -echo
read -r pass < /dev/tty ||: read -r pass < /dev/tty && cached=1
stty -F /dev/tty echo stty -F /dev/tty echo
printf '\n' printf '\n'
# Validate the password now with a simple 'true' command as we # Validate the password now with a simple 'true' command as we
# don't yet need to elevate permissions. # don't yet need to elevate permissions.
# dosu /bin/true
# Rather than checking if the '$pass' variable is non-empty,
# use an additional variable. The '[' command can be external
# which would result in '/proc' leakage.
dosu /bin/true && have_pw=1
} }
dosu() { dosu() {
[ "$have_pw" ] || root_cache [ "$cached" ] || root_cache
# Declare this as a function to avoid repeating it twice # Declare this as a function to avoid repeating it twice
# below. Great naming of functions all around. # below. Great naming of functions all around.
@ -551,7 +547,7 @@ pkg_build() {
[ $# -gt 1 ] || [ "$pkg_update" ] && { [ $# -gt 1 ] || [ "$pkg_update" ] && {
prompt prompt
[ "$have_pw" ] || root_cache [ "$cached" ] || root_cache
} }
log "Checking to see if any dependencies have already been built" log "Checking to see if any dependencies have already been built"