From 744be856b0f1e8ad69e5dc0982062513702e7e33 Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Sun, 20 Aug 2017 00:51:52 -0400 Subject: [PATCH] Fixed prog_lock so multiple different plugins could run --- src/dynamic-ip | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/dynamic-ip b/src/dynamic-ip index 978e17b..7021fcd 100755 --- a/src/dynamic-ip +++ b/src/dynamic-ip @@ -373,12 +373,14 @@ check-update() { } prog_lock() { + local lock_name=$1 + ## Locking - if [[ "$USER" = "root" ]]; then - LOCKFILE="/var/lock/$(basename "$0")" + if [[ "$USER" == "root" ]]; then + LOCKFILE="/var/lock/${lock_name}" else - LOCKFILE="/tmp/${USER}/lock/$(basename "$0")" + LOCKFILE="/tmp/${USER}/lock/${lock_name}" mkdir -p "/tmp/${USER}/lock" fi LOCKFD=99 @@ -412,14 +414,13 @@ prog_lock() { if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then # Internal Initialization - #prog_name=$(basename "$0") + prog_name=$(basename "$0") script_dir=$(dirname "$(readlink -f "$0")") - prog_lock - # Main if [[ -r "${script_dir}/plugins/${1}" ]]; then + prog_lock "${prog_name}-${1}" # shellcheck source=plugins/update-ipv4 source "${script_dir}/plugins/${1}" else