From 3f9d9ca67de5456702c92cd8454332466d16696f Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Wed, 10 Nov 2021 03:33:08 +0100 Subject: [PATCH] Code cleanup --- src/deforaos-jobs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/deforaos-jobs b/src/deforaos-jobs index 4347e9d..08b98f0 100755 --- a/src/deforaos-jobs +++ b/src/deforaos-jobs @@ -47,11 +47,12 @@ QUERY_EXEC_SELECT="SELECT jobs_id, command FROM jobs WHERE started IS NULL ORDER QUERY_INIT="CREATE TABLE jobs (jobs_id INTEGER PRIMARY KEY, timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, command VARCHAR(255), started TIMESTAMP DEFAULT NULL, pid INTEGER DEFAULT NULL, code INTEGER DEFAULT NULL, completed TIMESTAMP DEFAULT NULL)" QUERY_LIST="SELECT * FROM jobs" SYSCONFDIR="$PREFIX/etc" +VENDOR="DeforaOS" #load local settings -[ -f "$SYSCONFDIR/DeforaOS/$PROGNAME.conf" ] && - . "$SYSCONFDIR/DeforaOS/$PROGNAME.conf" -[ -f "$HOME/.config/DeforaOS/$PROGNAME.conf" ] && - . "$HOME/.config/DeforaOS/$PROGNAME.conf" +[ -f "$SYSCONFDIR/$VENDOR/$PROGNAME.conf" ] && + . "$SYSCONFDIR/$VENDOR/$PROGNAME.conf" +[ -f "$HOME/.config/$VENDOR/$PROGNAME.conf" ] && + . "$HOME/.config/$VENDOR/$PROGNAME.conf" #Error codes: # 1 Usage error