summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2013-12-15 07:32:47 -0800
committerAttila Molnar <attilamolnar@hush.com>2013-12-15 07:32:47 -0800
commit575a3126834d3f283f6296e33c8bce94ee7a0f59 (patch)
tree0b96c8e7ea3d06410be1cd053b9996fba64d3c89
parent59df199aaedf8018979c444eaa8cca59ff001877 (diff)
parent4f79296bc078c4e0d615abbf2da6b19f5164acbd (diff)
Merge pull request #708 from SaberUK/master+development-branch
Add a warning that the user is using a development version.
-rw-r--r--README.md7
-rwxr-xr-xconfigure15
2 files changed, 22 insertions, 0 deletions
diff --git a/README.md b/README.md
index caadad82d..89524e7e7 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,10 @@
+### Important Notice
+
+The `master` branch contains the latest development version. If you are running
+a server then you probably want the `insp20` branch. You can obtain this from
+the [releases](https://github.com/inspircd/inspircd/releases) page or by running
+`git checkout insp20` if you are installing via Git.
+
### About
InspIRCd is a modular Internet Relay Chat (IRC) server written in C++ for Linux,
diff --git a/configure b/configure
index 1ff8da63b..5873961ec 100755
--- a/configure
+++ b/configure
@@ -281,6 +281,21 @@ STOP
print "\e[0m\n\n";
print "The following compiler has been detected: \e[1;32m$cxx{NAME} $cxx{VERSION}\e[0m ($config{CXX})\n\n";
+ # Check that the user actually wants this version.
+ if (index($version, '+') != -1) {
+ print <<"EOW" ;
+\e[1;31mWARNING!\e[0m You are building a development version. This contains code which has
+not been tested as heavily and may contain various faults which could seriously
+affect the running of your server. It is recommended that you use a stable
+version instead.
+
+You can obtain the latest stable version from https://github.com/inspircd/inspircd/releases
+or by running `git checkout insp20` if you are installing from Git.
+
+EOW
+ exit 1 unless prompt_bool(1, 'I understand this warning and want to continue anyway.', 0);
+ }
+
# Directory Settings..
my $tmpbase = $config{BASE_DIR};
$config{BASE_DIR} = prompt_dir(1, 'What directory do you wish to install the InspIRCd base?', $config{BASE_DIR});