From 0d27cc7d440a7e419f31107d556c4f9a036ceb48 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Tue, 3 Nov 2020 15:33:36 +0100 Subject: [PATCH] Move the job scripts around for clarity --- src/deforaos-git-hook | 6 ++--- ...{deforaos-git-doc => deforaos-job-git-doc} | 2 +- ...aos-git-mirror => deforaos-job-git-mirror} | 2 +- ...oraos-git-tests => deforaos-job-git-tests} | 2 +- src/project.conf | 26 +++++++++---------- 5 files changed, 19 insertions(+), 19 deletions(-) rename src/{deforaos-git-doc => deforaos-job-git-doc} (98%) rename src/{deforaos-git-mirror => deforaos-job-git-mirror} (98%) rename src/{deforaos-git-tests => deforaos-job-git-tests} (98%) diff --git a/src/deforaos-git-hook b/src/deforaos-git-hook index 8708221..e6cd899 100755 --- a/src/deforaos-git-hook +++ b/src/deforaos-git-hook @@ -38,9 +38,9 @@ RM="rm -f" HOOKS="irc jobs" IRC_CHANNEL= IRC_SERVER= -JOBS_BRANCH_MASTER="$PREFIX/libexec/deforaos-git-mirror -$PREFIX/libexec/deforaos-git-doc -$PREFIX/libexec/deforaos-git-tests" +JOBS_BRANCH_MASTER="$PREFIX/libexec/deforaos-jobs/deforaos-job-git-mirror +$PREFIX/libexec/deforaos-jobs/deforaos-job-git-doc +$PREFIX/libexec/deforaos-jobs/deforaos-job-git-tests" PROGNAME="deforaos-git-hook" SYSCONFDIR="$PREFIX/etc" #load local settings diff --git a/src/deforaos-git-doc b/src/deforaos-job-git-doc similarity index 98% rename from src/deforaos-git-doc rename to src/deforaos-job-git-doc index 9252ada..1bc9208 100755 --- a/src/deforaos-git-doc +++ b/src/deforaos-job-git-doc @@ -42,7 +42,7 @@ DATADIR="$PREFIX/share" GIT_BRANCH="master" GIT_REMOTE= MIRROR="doc:doc" -PROGNAME="deforaos-git-doc" +PROGNAME="deforaos-job-git-doc" SYSCONFDIR="$PREFIX/etc" #load local settings [ -f "$SYSCONFDIR/DeforaOS/$PROGNAME.conf" ] && diff --git a/src/deforaos-git-mirror b/src/deforaos-job-git-mirror similarity index 98% rename from src/deforaos-git-mirror rename to src/deforaos-job-git-mirror index cc38308..6fb6626 100755 --- a/src/deforaos-git-mirror +++ b/src/deforaos-job-git-mirror @@ -36,7 +36,7 @@ GIT_MIRROR= GIT_REMOTE="origin" #settings PREFIX="/usr/local" -PROGNAME="deforaos-git-mirror" +PROGNAME="deforaos-job-git-mirror" SYSCONFDIR="$PREFIX/etc" #load local settings [ -f "$SYSCONFDIR/DeforaOS/$PROGNAME.conf" ] && diff --git a/src/deforaos-git-tests b/src/deforaos-job-git-tests similarity index 98% rename from src/deforaos-git-tests rename to src/deforaos-job-git-tests index 8bbd9fb..dfa0b9e 100755 --- a/src/deforaos-git-tests +++ b/src/deforaos-job-git-tests @@ -39,7 +39,7 @@ RM="rm -f" GIT_BRANCH="master" GIT_REMOTE= PREFIX="/usr/local" -PROGNAME="deforaos-git-tests" +PROGNAME="deforaos-job-git-tests" SYSCONFDIR="$PREFIX/etc" #load local settings [ -f "$SYSCONFDIR/DeforaOS/$PROGNAME.conf" ] && diff --git a/src/project.conf b/src/project.conf index 55de4b2..6a55c15 100644 --- a/src/project.conf +++ b/src/project.conf @@ -1,4 +1,4 @@ -dist=Makefile,deforaos-build,deforaos-document,deforaos-git-doc,deforaos-git-hook,deforaos-git-message,deforaos-git-mirror,deforaos-git-tests,deforaos-irc,deforaos-jobs,deforaos-lock,deforaos-package,deforaos-release,deforaos-update +dist=Makefile,deforaos-build,deforaos-document,deforaos-git-hook,deforaos-git-message,deforaos-irc,deforaos-job-git-doc,deforaos-job-git-mirror,deforaos-job-git-tests,deforaos-jobs,deforaos-lock,deforaos-package,deforaos-release,deforaos-update [deforaos-build] install=$(PREFIX)/bin @@ -8,10 +8,6 @@ mode=0755 install=$(PREFIX)/bin mode=0755 -[deforaos-git-doc] -install=$(PREFIX)/libexec -mode=0755 - [deforaos-git-hook] install=$(PREFIX)/libexec mode=0755 @@ -20,18 +16,22 @@ mode=0755 install=$(PREFIX)/libexec mode=0755 -[deforaos-git-mirror] -install=$(PREFIX)/libexec -mode=0755 - -[deforaos-git-tests] -install=$(PREFIX)/libexec -mode=0755 - [deforaos-irc] install=$(PREFIX)/libexec mode=0755 +[deforaos-job-git-doc] +install=$(PREFIX)/libexec/deforaos-jobs +mode=0755 + +[deforaos-job-git-mirror] +install=$(PREFIX)/libexec/deforaos-jobs +mode=0755 + +[deforaos-job-git-tests] +install=$(PREFIX)/libexec/deforaos-jobs +mode=0755 + [deforaos-jobs] install=$(PREFIX)/bin mode=0755