Merge branch 'master' of github.com:krebscode/painload

21 files changed, 85 insertions, 3 deletions

diff --git a/btc/mining/bin/ensure-router b/btc/mining/bin/ensure-router
index ec78f610..5eedabc9 100755
--- a/btc/mining/bin/ensure-router
+++ b/btc/mining/bin/ensure-router
@@ -8,10 +8,19 @@ fi
 
 if=eth2
 
+rc() {
+  for x in /etc/init.d/$1 /etc/rc.d/$1; do
+    if test -x $x; then
+      $x restart
+      break
+    fi
+  done
+}
+
 if ! ifconfig $if | grep -q 'inet addr'; then
   beep -l 50 -f 2500; ifconfig $if 0.0.0.0 down || :
   beep -l 50 -f 2500; ifconfig $if 23.0.0.1/8 up || :
-  beep -l 50 -f 2500; /etc/init.d/dnsmasq restart
+  beep -l 50 -f 2500; rc dnsmasq restart
   beep -l 50 -f 2500; iptables -t nat -A POSTROUTING -o wlan0 -j MASQUERADE
   beep -l 50 -f 2500; iptables -t nat -A POSTROUTING -o eth2 -j MASQUERADE
   if ifconfig $if | grep -q 'inet addr'; then
diff --git a/evan/satz-liste b/evan/satz-liste
index 7586ea3b..33b1bc82 100644
--- a/evan/satz-liste
+++ b/evan/satz-liste
@@ -4,7 +4,8 @@ ein sauberer scheck ist ein guter scheck
 auch du weißt wie man den geschirrspüler einräumt
 wer die toilette putzt kommt in den himmel
 der große bruder sieht es gerne wenn die genossen die vereinsräume in stand halten
-henry der staubsauger saugt für dich
 muelltrennung bringt gutes karma
-saubere mitglieder sind glückliche mitglieder
 fnord
+bewässere die Pflanzen
+Öffne ein Fenster
+wische die tische
diff --git a/submodules/zsh/zsh b/submodules/zsh/zsh
deleted file mode 160000
-Subproject d48faef8cdff3c7c63c0a9164443e3d337aa1ec
diff --git a/tts/bin/alberto b/tts/bin/alberto
new file mode 120000
index 00000000..6947e393
--- /dev/null
+++ b/tts/bin/alberto
@@ -0,0 +1 @@
+../../util/bin/naturalvoices.att
\ No newline at end of file
diff --git a/tts/bin/anjali b/tts/bin/anjali
new file mode 120000
index 00000000..6947e393
--- /dev/null
+++ b/tts/bin/anjali
@@ -0,0 +1 @@
+../../util/bin/naturalvoices.att
\ No newline at end of file
diff --git a/tts/bin/arnaud b/tts/bin/arnaud
new file mode 120000
index 00000000..6947e393
--- /dev/null
+++ b/tts/bin/arnaud
@@ -0,0 +1 @@
+../../util/bin/naturalvoices.att
\ No newline at end of file
diff --git a/tts/bin/audrey b/tts/bin/audrey
new file mode 120000
index 00000000..6947e393
--- /dev/null
+++ b/tts/bin/audrey
@@ -0,0 +1 @@
+../../util/bin/naturalvoices.att
\ No newline at end of file
diff --git a/tts/bin/charles b/tts/bin/charles
new file mode 120000
index 00000000..6947e393
--- /dev/null
+++ b/tts/bin/charles
@@ -0,0 +1 @@
+../../util/bin/naturalvoices.att
\ No newline at end of file
diff --git a/tts/bin/claire b/tts/bin/claire
new file mode 120000
index 00000000..6947e393
--- /dev/null
+++ b/tts/bin/claire
@@ -0,0 +1 @@
+../../util/bin/naturalvoices.att
\ No newline at end of file
diff --git a/tts/bin/crystal b/tts/bin/crystal
new file mode 120000
index 00000000..6947e393
--- /dev/null
+++ b/tts/bin/crystal
@@ -0,0 +1 @@
+../../util/bin/naturalvoices.att
\ No newline at end of file
diff --git a/tts/bin/francesca b/tts/bin/francesca
new file mode 120000
index 00000000..6947e393
--- /dev/null
+++ b/tts/bin/francesca
@@ -0,0 +1 @@
+../../util/bin/naturalvoices.att
\ No newline at end of file
diff --git a/tts/bin/giovanni b/tts/bin/giovanni
new file mode 120000
index 00000000..6947e393
--- /dev/null
+++ b/tts/bin/giovanni
@@ -0,0 +1 @@
+../../util/bin/naturalvoices.att
\ No newline at end of file
diff --git a/tts/bin/juliette b/tts/bin/juliette
new file mode 120000
index 00000000..6947e393
--- /dev/null
+++ b/tts/bin/juliette
@@ -0,0 +1 @@
+../../util/bin/naturalvoices.att
\ No newline at end of file
diff --git a/tts/bin/klara b/tts/bin/klara
new file mode 120000
index 00000000..6947e393
--- /dev/null
+++ b/tts/bin/klara
@@ -0,0 +1 @@
+../../util/bin/naturalvoices.att
\ No newline at end of file
diff --git a/tts/bin/lauren b/tts/bin/lauren
new file mode 120000
index 00000000..6947e393
--- /dev/null
+++ b/tts/bin/lauren
@@ -0,0 +1 @@
+../../util/bin/naturalvoices.att
\ No newline at end of file
diff --git a/tts/bin/mike b/tts/bin/mike
new file mode 120000
index 00000000..6947e393
--- /dev/null
+++ b/tts/bin/mike
@@ -0,0 +1 @@
+../../util/bin/naturalvoices.att
\ No newline at end of file
diff --git a/tts/bin/reiner b/tts/bin/reiner
new file mode 120000
index 00000000..6947e393
--- /dev/null
+++ b/tts/bin/reiner
@@ -0,0 +1 @@
+../../util/bin/naturalvoices.att
\ No newline at end of file
diff --git a/tts/bin/rich b/tts/bin/rich
new file mode 120000
index 00000000..6947e393
--- /dev/null
+++ b/tts/bin/rich
@@ -0,0 +1 @@
+../../util/bin/naturalvoices.att
\ No newline at end of file
diff --git a/tts/bin/rosa b/tts/bin/rosa
new file mode 120000
index 00000000..6947e393
--- /dev/null
+++ b/tts/bin/rosa
@@ -0,0 +1 @@
+../../util/bin/naturalvoices.att
\ No newline at end of file
diff --git a/tts/names b/tts/names
new file mode 100644
index 00000000..576c74e5
--- /dev/null
+++ b/tts/names
@@ -0,0 +1,16 @@
+alberto
+anjali
+arnaud
+audrey
+charles
+claire
+crystal
+francesca
+giovanni
+juliette
+klara
+lauren
+mike
+reiner
+rich
+rosa
diff --git a/util/bin/naturalvoices.att b/util/bin/naturalvoices.att
new file mode 100755
index 00000000..e329694f
--- /dev/null
+++ b/util/bin/naturalvoices.att
@@ -0,0 +1,40 @@
+#! /bin/sh
+set -euf
+
+A=Mozilla
+baseURL="http://192.20.225.36"
+url="$baseURL/tts/cgi-bin/nph-talk"
+
+pwd="$(dirname "$(readlink -f "$0")")"
+
+for x in \
+    "$pwd/../../submodules/github/tmpvar" \
+    "$pwd/../../submodules/github/mikeal" \
+    "$pwd/../../submodules/github/NV" \
+    "$pwd/../../submodules/github/tautologistics" \
+; do
+  export NODE_PATH="`readlink -f "$x"`${NODE_PATH+:$NODE_PATH}"
+done
+
+# ensure query is ready
+(cd "$pwd/../.." && git submodule update --init)
+
+{
+  for arg; do echo "$arg"; done | sed -rn '
+    s/^--(.*=.*)/\1/p;t
+    s/.*/text="${text+$text }&"/p;t
+  '
+  cat<<EOF
+  query() {
+    node "$(readlink -f "$pwd/../../submodules/github/visionmedia/query")" "\$@"
+  }
+  curl -sS -A "\${A-Mozilla}"  \\
+      -d "voice=\${voice-klara}" \\
+      -d "txt=\$text" \\
+      -d "downloadButton=DOWNLOAD" \\
+      "$url" | 
+    query 'p a'
+EOF
+} | sh | while read url; do
+  curl -sS "$baseURL$url" | aplay -q -
+done