diff --git a/config.mk.sh b/config.mk.sh index 9471c95..07a7f88 100644 --- a/config.mk.sh +++ b/config.mk.sh @@ -1,7 +1,6 @@ # make.sh config -PREFIX=${PREFIX:-/} -USR=${USR:-"${PREFIX}usr/local"} - -BINDIR=${BINDIR:-"${DESTDIR}${USR}/bin"} LOGDIR=${LOGDIR:-"/tmp/userrc"} -CONFIG=${CONFIG:-"/etc/userrc.conf"} + +BINDIR=${BINDIR:-"${PREFIX}/bin"} +CONFDIR=${CONFDIR:-"${PREFIX}/etc"} +CONFIG=${CONFIG:-"${CONFDIR}/userrc.conf"} diff --git a/make.sh b/make.sh index c663929..3e94f4c 100755 --- a/make.sh +++ b/make.sh @@ -5,9 +5,12 @@ set -e set_vars() { printf 'Setting vars...\n' >&2 - sed -r \ - -e "s%@CONFIG@%${CONFIG}%" \ - -e "s%@LOGDIR@%${LOGDIR}%" + for i in "$@"; do + sed -r \ + -e "s%@CONFIG@%${CONFIG}%" \ + -e "s%@LOGDIR@%${LOGDIR}%" \ + < "$i".in > "$i" + done } do_tell() { @@ -20,9 +23,9 @@ target_userrc() { target='userrc' printf '%s\n' "Building $target..." - set_vars < "$target".in > "$target" + + set_vars "$target" do_tell chmod 755 "$target" - ls -l "$target" } target_clean() { diff --git a/userrc.in b/userrc.in index 6f1d424..bdfcd2f 100644 --- a/userrc.in +++ b/userrc.in @@ -47,7 +47,7 @@ get_allowed_users() { msg "Running in $access_mode access mode." - case "${access_mode:-freeforall}" in + case "${access_mode:-blacklist}" in explicit) while IFS=':' read -r username pass uid gid description homedir shell; do if is_whitelisted "$username"; then