From a17e495edee3a45131ec40eebd70ba3ff4d4a533 Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Sat, 12 Oct 2013 17:51:36 -0400 Subject: pro-archman: Replace more ${opt_base_dir}. --- diff --git a/src/pro-archman.sh b/src/pro-archman.sh index 05b076f..62d9461 100644 --- a/src/pro-archman.sh +++ b/src/pro-archman.sh @@ -134,8 +134,8 @@ init() lock() { - mkdir -p "${opt_base_dir}/.db" - lock="${opt_base_dir}/.db/lock" + mkdir -p "${base_dir}/.db" + lock="${base_dir}/.db/lock" if ! (set -C; printf '%d\n' "${$}" >"${lock}") 2>/dev/null; then error 2 "$(get_msg 'lock_fail')" fi @@ -150,12 +150,12 @@ get_conf() conf_incoming_dir='../incoming' conf_pool_gc_delay=86400 - if [ -f "${opt_base_dir}/conf" ]; then - . "${opt_base_dir}/conf" + if [ -f "${base_dir}/conf" ]; then + . "${base_dir}/conf" fi old_dir="$(pwd)" - cd "${opt_base_dir}" + cd "${base_dir}" if [ -d "${conf_incoming_dir}" ]; then conf_incoming_dir="$(cd "${conf_incoming_dir}" && pwd)" fi -- cgit v0.9.1