fixes

    - Makefile is better: the generated password via genpass.pl
    or genpass.pl with -i flag should now be a correct argon2id hash
    in both cases.
    - Added missing checks in the makefile
    - Fixed undeclared variables in gpigeon-template.cgi

Running make should be better and require less manual fiddling now.

1 files changed, 2 insertions, 1 deletions

diff --git a/genpass.pl b/genpass.pl
index a57d98b..829ac48 100755
--- a/genpass.pl
+++ b/genpass.pl
@@ -29,12 +29,13 @@ my $opt = $ARGV[0];
 sub FillConfigMk { 
         my $hash = shift;
         $hash =~ s/\$/\\044/g;
+        $hash =~ s/\\/\\\\/g;
         my $mkconfig = 'config.mk';
         if (-e $mkconfig){
             open my $in, '<', $mkconfig or die "$!";
                 open my $out, '>', "$mkconfig.tmp" or die "$!";
                 while (<$in>){
-                   s/ARGON2ID_HASH =.*/ARGON2ID_HASH = `printf "$hash"`/gi; 
+                   s/ARGON2ID_HASH =.*/ARGON2ID_HASH =$hash/gi; 
                    print $out $_;
                 }
                 close $out;