remotor: don't fail creating the torlog socket

2 files changed, 16 insertions, 2 deletions

diff --git a/bin/psycamp b/bin/psycamp
index a776cd0..88c546e 100755
--- a/bin/psycamp
+++ b/bin/psycamp
@@ -526,9 +526,9 @@ sub next {
                 my $f = $1 || $CurrentFile;
                 $f =~ y/-/_/;
                 &sys($has_espeak, '-v', 'en-german-5', '-p', 87, '-s', 101, $f);
+                &sys($has_espeak, '-v', 'en-romanian', '-p', 23, '-s', 87, '-k', 87,
+                  rand(7) > 2 ? 'bullshit' : 'cool') if rand(9) > 7;
         }
-        &sys($has_espeak, '-v', 'en-romanian', '-p', 23, '-s', 87, '-k', 87, rand(7) > 2 ? 'bullshit' : 'cool')
-          if $has_espeak and $opt_A;
         &exit(0) if !$n or ($n eq '') or !$NS or $CS >= $NS;
 #       return &next(0) if $opt_S and $n =~ /\b$KEEP\b/oi;
         &open( $n );
diff --git a/bin/remotor b/bin/remotor
index a038ecb..50a75f0 100755
--- a/bin/remotor
+++ b/bin/remotor
@@ -221,6 +221,18 @@ sub idlebilly {
         print $torsock "GETINFO stream-status\n";
 }
 
+sub mkdirhier {
+        my $d = shift;
+        if (-d $d) {
+#               print STDERR BLUE, "(directory $d already exists)\n", RESET;
+        } else {
+                if (system('/bin/mkdir', '-p', $d)) {
+                        undef $!;
+                        die "Could not make directory hierarchy: $!"
+                            if system('mkdirhier', $d);
+                }
+        }
+}
 
 ## MAIN ###
 
@@ -256,6 +268,8 @@ sub idlebilly {
         $opt_m = $config{"$nick:monitor"} if !$opt_m and $config{"$nick:monitor"};
         $torlog = $opt_m || "/var/run/tor/log.fifo";
         if (($opt_m || $opt_f) and not -p $torlog) {
+                $torlog =~ m#(.*)/[^/]+$#;
+                mkdirhier( $1 ) if $1;
                 undef $!;
                 die "Could not mkfifo $torlog: $!" unless mkfifo $torlog, 0600;
                 system('chgrp', 'tor', $torlog);