From: Martin Mares <mj@ucw.cz>
Date: Tue, 12 Feb 2013 09:43:46 +0000 (+0100)
Subject: Configuration files moved from directory "BEX" to "cf"
X-Git-Tag: v3.2~9
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=05d15284a242dd122311f605fd1ac27465588f3d;p=bex.git

Configuration files moved from directory "BEX" to "cf"

Too many things were called "BEX".
---

diff --git a/BEX/config b/BEX/config
deleted file mode 100644
index 09c1b1b..0000000
--- a/BEX/config
+++ /dev/null
@@ -1,12 +0,0 @@
-# Configuration of the Batch EXecutor
-# This is a Perl script, which can set anything in the BEX::Config package
-
-package BEX::Config;
-
-%machines = (
-	'albireo' => { 'Host' => 'albireo.burrow.ucw.cz' },
-	'localhost' => {},
-	'home' => ['albireo', 'localhost'],
-);
-
-42;
diff --git a/BEX/epilog b/BEX/epilog
deleted file mode 100644
index bc2da7a..0000000
--- a/BEX/epilog
+++ /dev/null
@@ -1 +0,0 @@
-# BEX epilog
diff --git a/BEX/prolog b/BEX/prolog
deleted file mode 100644
index 3350a91..0000000
--- a/BEX/prolog
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-# BEX prolog
-set -e
diff --git a/bex b/bex
index f4db56f..76c2c3c 100755
--- a/bex
+++ b/bex
@@ -44,8 +44,8 @@ Getopt::Long::Configure('default');
 if (!-d $bex_home) {
 	die "BEX home directory $bex_home does not exist.\n";
 }
-if (!-d "$bex_home/BEX") {
-	die "BEX home directory $bex_home does not contain the BEX subdirectory.\n";
+if (!-d "$bex_home/cf") {
+	die "BEX home directory $bex_home does not contain the cf subdirectory.\n";
 }
 if (!-f "$bex_lib/perl/BEX.pm") {
 	die "BEX library directory $bex_lib misconfigured.\n";
diff --git a/cf/config b/cf/config
new file mode 100644
index 0000000..09c1b1b
--- /dev/null
+++ b/cf/config
@@ -0,0 +1,12 @@
+# Configuration of the Batch EXecutor
+# This is a Perl script, which can set anything in the BEX::Config package
+
+package BEX::Config;
+
+%machines = (
+	'albireo' => { 'Host' => 'albireo.burrow.ucw.cz' },
+	'localhost' => {},
+	'home' => ['albireo', 'localhost'],
+);
+
+42;
diff --git a/cf/epilog b/cf/epilog
new file mode 100644
index 0000000..bc2da7a
--- /dev/null
+++ b/cf/epilog
@@ -0,0 +1 @@
+# BEX epilog
diff --git a/cf/prolog b/cf/prolog
new file mode 100644
index 0000000..3350a91
--- /dev/null
+++ b/cf/prolog
@@ -0,0 +1,3 @@
+#!/bin/sh
+# BEX prolog
+set -e
diff --git a/lib/perl/BEX/Config.pm b/lib/perl/BEX/Config.pm
index 739b2eb..8a36d45 100644
--- a/lib/perl/BEX/Config.pm
+++ b/lib/perl/BEX/Config.pm
@@ -22,7 +22,7 @@ our $lib = $ENV{"BEX_LIB"} // "lib";
 our $home = $ENV{"BEX_HOME"} // ".";
 
 # Configuration directory
-our $cf_dir = $home . "/BEX";
+our $cf_dir = $home . "/cf";
 
 # A file whose contents should be prepended before the job. Should start with the "#!" line.
 our $job_prolog = $cf_dir . '/prolog';