X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=tools%2Fgenssl;h=a8fc51514477d7cfe7112d2db11041a1753eceb4;hb=e94b673532f7833aaa4789f834e61d68e0b4fc56;hp=930f4b1d71e35b5690ca6b297a18ef631fc82734;hpb=dd9d0d023e044c0dd926e5cc5139037250995544;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/tools/genssl b/tools/genssl
index 930f4b1d7..a8fc51514 100755
--- a/tools/genssl
+++ b/tools/genssl
@@ -2,7 +2,8 @@
 #
 # InspIRCd -- Internet Relay Chat Daemon
 #
-#   Copyright (C) 2013-2017, 2020 Sadie Powell <sadie@witchery.services>
+#   Copyright (C) 2020 Nicole Kleinhoff <ilbelkyr@shalture.org>
+#   Copyright (C) 2013-2017, 2020-2021 Sadie Powell <sadie@witchery.services>
 #
 # This file is part of InspIRCd.  InspIRCd is free software: you can
 # redistribute it and/or modify it under the terms of the GNU General Public
@@ -18,11 +19,7 @@
 #
 
 
-BEGIN {
-	require 5.10.0;
-}
-
-use feature ':5.10';
+use v5.10.0;
 use strict;
 use warnings FATAL => qw(all);
 
@@ -31,10 +28,18 @@ use File::Temp();
 # IMPORTANT: This script has to be able to run by itself so that it can be used
 #            by binary distributions where the make/console.pm module will not
 #            be available!
+eval {
+	use File::Basename qw(dirname);
+	use FindBin        qw($RealDir);
+
+	use lib dirname $RealDir;
+	require make::console;
+	make::console->import();
+};
 
 sub prompt($$) {
 	my ($question, $default) = @_;
-	return prompt_string(1, $question, $default) if eval 'use File::Basename; use FindBin; use lib dirname($FindBin::RealDir); use make::console; 1';
+	return prompt_string(1, $question, $default) if defined main->can('prompt_string');
 	say $question;
 	print "[$default] => ";
 	chomp(my $answer = <STDIN>);
@@ -42,8 +47,8 @@ sub prompt($$) {
 	return $answer ? $answer : $default;
 }
 
-if ($#ARGV != 0 || $ARGV[0] !~ /^(?:auto|gnutls|openssl)$/i) {
-	say STDERR "Usage: $0 <auto|gnutls|openssl>";
+if (scalar @ARGV < 1 || $ARGV[0] !~ /^(?:auto|gnutls|openssl)$/i) {
+	say STDERR "Usage: $0 <auto|gnutls|openssl> [SSL-DIR]";
 	exit 1;
 }
 
@@ -75,6 +80,12 @@ if ($tool eq 'auto') {
 	exit 1;
 }
 
+# Output to the cwd unless an SSL directory is specified.
+if (scalar @ARGV > 1 && !chdir $ARGV[1]) {
+	say STDERR "Unable to change the working directory to $ARGV[1]: $!.";
+	exit 1;
+}
+
 # Harvest information needed to generate the certificate.
 my $common_name = prompt('What is the hostname of your server?', 'irc.example.com');
 my $email = prompt('What email address can you be contacted at?', 'example@example.com');