Force variables definition and add a set -u
This commit is contained in:
parent
4b788a99d8
commit
828a243745
33
bkctld
33
bkctld
|
@ -8,6 +8,8 @@
|
||||||
# Licence: AGPLv3
|
# Licence: AGPLv3
|
||||||
#
|
#
|
||||||
|
|
||||||
|
set -u
|
||||||
|
|
||||||
usage(){
|
usage(){
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
Usage: $0 <subcommand> [options]
|
Usage: $0 <subcommand> [options]
|
||||||
|
@ -475,21 +477,22 @@ main() {
|
||||||
[ "$(id -u)" -ne 0 ] && error "You need to be root to run $0 !"
|
[ "$(id -u)" -ne 0 ] && error "You need to be root to run $0 !"
|
||||||
|
|
||||||
[ -f /etc/default/bkctld ] && . /etc/default/bkctld
|
[ -f /etc/default/bkctld ] && . /etc/default/bkctld
|
||||||
[ -z "${CONFDIR}" ] && CONFDIR='/etc/evobackup'
|
CONFDIR="${CONFDIR:-/etc/evobackup}"
|
||||||
[ -z "${JAILDIR}" ] && JAILDIR='/backup/jails'
|
JAILDIR="${JAILDIR:-/backup/jails}"
|
||||||
[ -z "${INCDIR}" ] && INCDIR='/backup/incs'
|
INCDIR="${INCDIR:-/backup/incs}"
|
||||||
[ -z "${TPLDIR}" ] && TPLDIR='/usr/share/bkctld'
|
TPLDIR="${TPLDIR:-/usr/share/bkctld}"
|
||||||
[ -z "${LOCALTPLDIR}" ] && LOCALTPLDIR='/usr/local/share/bkctld'
|
LOCALTPLDIR="${LOCALTPLDIR:-/usr/local/share/bkctld}"
|
||||||
[ -z "${SSHD_PID}" ] && SSHD_PID='/run/sshd.pid'
|
SSHD_PID="${SSHD_PID:-/run/sshd.pid}"
|
||||||
[ -z "${SSHD_CONFIG}" ] && SSHD_CONFIG='/etc/ssh/sshd_config'
|
SSHD_CONFIG="${SSHD_CONFIG:-/etc/ssh/sshd_config}"
|
||||||
[ -z "${AUTHORIZED_KEYS}" ] && AUTHORIZED_KEYS='/root/.ssh/authorized_keys'
|
AUTHORIZED_KEYS="${AUTHORIZED_KEYS:-/root/.ssh/authorized_keys}"
|
||||||
[ -z "${LOGLEVEL}" ] && LOGLEVEL=6
|
FIREWALL_RULES="${FIREWALL_RULES:-}"
|
||||||
BTRFS=$(which btrfs)
|
LOGLEVEL="${LOGLEVEL:-6}"
|
||||||
mkdir -p $CONFDIR $JAILDIR $INCDIR
|
BTRFS=$(command -v btrfs)
|
||||||
subcommand=$1
|
mkdir -p "${CONFDIR}" "${JAILDIR}" "${INCDIR}"
|
||||||
jail=$2
|
subcommand="${1:-}"
|
||||||
option=$3
|
jail="${2:-}"
|
||||||
case $subcommand in
|
option="${3:-}"
|
||||||
|
case "${subcommand}" in
|
||||||
"" | "-h" | "--help")
|
"" | "-h" | "--help")
|
||||||
usage
|
usage
|
||||||
;;
|
;;
|
||||||
|
|
Loading…
Reference in a new issue