DeforaOS/scripts
DeforaOS/scripts
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for local settings

Browse Source
This commit is contained in:
Pierre Pronchery 2020-11-03 15:03:41 +01:00
parent 6498a09411
commit 8c357e171f
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/deforaos-jobs
View File

@ -23,33 +23,41 @@
#CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) #CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
#ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE #ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#POSSIBILITY OF SUCH DAMAGE. #POSSIBILITY OF SUCH DAMAGE.
#Error codes:
# 1 Usage error
# 2 Generic error
# 3 Could not lock the database
# 4 Could not unlock the database
#variables #variables
DATABASE_CONFFILE="deforaos-jobs.conf" PROGNAME="deforaos-jobs"
#executables
DATABASE="database"
DEBUG=
LOCK="mkdir"
UNLOCK="rmdir"
SED="sed"
#settings
DATABASE_CONFFILE="$PROGNAME.conf"
DATABASE_ENGINE="sqlite3" DATABASE_ENGINE="sqlite3"
DATABASE_FILE="deforaos-jobs.db" DATABASE_FILE="$PROGNAME.db"
DATABASE_INITFILE="deforaos-jobs.sql" DATABASE_INITFILE="$PROGNAME.sql"
DEVNULL="/dev/null" DEVNULL="/dev/null"
PREFIX="/usr/local" PREFIX="/usr/local"
PROGNAME_JOBS="defora-jobs"
QUERY_ADD_BEGIN="INSERT INTO jobs (command) VALUES ('" QUERY_ADD_BEGIN="INSERT INTO jobs (command) VALUES ('"
QUERY_ADD_END="')" QUERY_ADD_END="')"
QUERY_EXEC_SELECT="SELECT jobs_id, command FROM jobs WHERE started IS NULL ORDER BY jobs_id ASC LIMIT 1" QUERY_EXEC_SELECT="SELECT jobs_id, command FROM jobs WHERE started IS NULL ORDER BY jobs_id ASC LIMIT 1"
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_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" QUERY_LIST="SELECT * FROM jobs"
#executables SYSCONFDIR="$PREFIX/etc"
DATABASE="$PREFIX/bin/database" #load local settings
DEBUG= [ -f "$SYSCONFDIR/DeforaOS/$PROGNAME.conf" ] &&
LOCK="mkdir" . "$SYSCONFDIR/DeforaOS/$PROGNAME.conf"
UNLOCK="rmdir" [ -f "$HOME/.config/DeforaOS/$PROGNAME.conf" ] &&
SED="sed" . "$HOME/.config/DeforaOS/$PROGNAME.conf"
#Error codes:
# 1 Usage error
# 2 Generic error
# 3 Could not lock the database
# 4 Could not unlock the database
#functions #functions
@ -171,7 +179,7 @@ _debug()
#error #error
_error() _error()
{ {
echo "$PROGNAME_JOBS: $@" 1>&2 echo "$PROGNAME: $@" 1>&2
return 2 return 2
} }
@ -179,9 +187,9 @@ _error()
#usage #usage
_usage() _usage()
{ {
echo "Usage: $PROGNAME_JOBS [-d directory] add command" 1>&2 echo "Usage: $PROGNAME [-d directory] add command" 1>&2
echo " $PROGNAME_JOBS [-d directory] exec" 1>&2 echo " $PROGNAME [-d directory] exec" 1>&2
echo " $PROGNAME_JOBS [-d directory] list" 1>&2 echo " $PROGNAME [-d directory] list" 1>&2
return 1 return 1
} }