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

28 files changed, 68 insertions, 13 deletions

diff --git a/.gitignore b/.gitignore
index 0d20b648..6daa49cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
+a.out
 *.pyc
diff --git a/COPYING b/COPYING
new file mode 100644
index 00000000..5a8e3325
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,14 @@
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.
+
diff --git a/assimilator/bin/git-clone-into b/Refactory/bin/git-clone-into
index 67e820e6..67e820e6 100755
--- a/assimilator/bin/git-clone-into
+++ b/Refactory/bin/git-clone-into
diff --git a/Refactory/bin/git-eternal-move b/Refactory/bin/git-eternal-move
new file mode 100755
index 00000000..50361e7b
--- /dev/null
+++ b/Refactory/bin/git-eternal-move
@@ -0,0 +1,15 @@
+#! /bin/sh
+#
+# git-eternal-move FROM TO-DIRECTORY
+#
+set -euf
+if test $# -ne 2; then
+  echo 'Error 1: You are made of stupid!' >&2
+  exit 23
+fi
+exec git filter-branch --tree-filter "
+  set -euf
+  if test -e '$1'; then
+    mkdir -p '$2'
+    mv '$1' '$2'
+  fi"
diff --git a/beep.lol b/beep.lol
deleted file mode 100755
index f9c29dba..00000000
--- a/beep.lol
+++ /dev/null
@@ -1 +0,0 @@
-beep -l 350 -f 392 -D 100 --new -l 350 -f 392 -D 100 --new -l 350 -f 392 -D 100 --new -l 250 -f 311.1 -D 100 --new -l 25 -f 466.2 -D 100 --new -l 350 -f 392 -D 100 --new -l 250 -f 311.1 -D 100 --new -l 25 -f 466.2 -D 100 --new -l 700 -f 392 -D 100 --new -l 350 -f 587.32 -D 100 --new -l 350 -f 587.32 -D 100 --new -l 350 -f 587.32 -D 100 --new -l 250 -f 622.26 -D 100 --new -l 25 -f 466.2 -D 100 --new -l 350 -f 369.99 -D 100 --new -l 250 -f 311.1 -D 100 --new -l 25 -f 466.2 -D 100 --new -l 700 -f 392 -D 100 --new -l 350 -f 784 -D 100 --new -l 250 -f 392 -D 100 --new -l 25 -f 392 -D 100 --new -l 350 -f 784 -D 100 --new -l 250 -f 739.98 -D 100 --new -l 25 -f 698.46 -D 100 --new -l 25 -f 659.26 -D 100 --new -l 25 -f 622.26 -D 100 --new -l 50 -f 659.26 -D 400 --new -l 25 -f 415.3 -D 200 --new -l 350 -f 554.36 -D 100 --new -l 250 -f 523.25 -D 100 --new -l 25 -f 493.88 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 25 -f 440 -D 100 --new -l 50 -f 466.16 -D 400 --new -l 25 -f 311.13 -D 200 --new -l 350 -f 369.99 -D 100 --new -l 250 -f 311.13 -D 100 --new -l 25 -f 392 -D 100 --new -l 350 -f 466.16 -D 100 --new -l 250 -f 392 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 700 -f 587.32 -D 100 --new -l 350 -f 784 -D 100 --new -l 250 -f 392 -D 100 --new -l 25 -f 392 -D 100 --new -l 350 -f 784 -D 100 --new -l 250 -f 739.98 -D 100 --new -l 25 -f 698.46 -D 100 --new -l 25 -f 659.26 -D 100 --new -l 25 -f 622.26 -D 100 --new -l 50 -f 659.26 -D 400 --new -l 25 -f 415.3 -D 200 --new -l 350 -f 554.36 -D 100 --new -l 250 -f 523.25 -D 100 --new -l 25 -f 493.88 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 25 -f 440 -D 100 --new -l 50 -f 466.16 -D 400 --new -l 25 -f 311.13 -D 200 --new -l 350 -f 392 -D 100 --new -l 250 -f 311.13 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 300 -f 392.00 -D 150 --new -l 250 -f 311.13 -D 100 --new -l 25 -f 466.16 -D 100 --new -l 700 -f 392 
diff --git a/btcguild/index.js b/btc/btcguild/index.js
index 1f33db06..1f33db06 100644
--- a/btcguild/index.js
+++ b/btc/btcguild/index.js
diff --git a/mining/CONFIGURE b/btc/mining/CONFIGURE
index 299cbd53..299cbd53 100644
--- a/mining/CONFIGURE
+++ b/btc/mining/CONFIGURE
diff --git a/mining/Makefile b/btc/mining/Makefile
index 8701920f..8701920f 100644
--- a/mining/Makefile
+++ b/btc/mining/Makefile
diff --git a/mining/README b/btc/mining/README
index ad8c3468..ad8c3468 100644
--- a/mining/README
+++ b/btc/mining/README
diff --git a/mining/TODO b/btc/mining/TODO
index bafaa72a..bafaa72a 100644
--- a/mining/TODO
+++ b/btc/mining/TODO
diff --git a/mining/bin/archlinux-cruise-control b/btc/mining/bin/archlinux-cruise-control
index de5a0fa4..de5a0fa4 100755
--- a/mining/bin/archlinux-cruise-control
+++ b/btc/mining/bin/archlinux-cruise-control
diff --git a/mining/bin/ati_temper b/btc/mining/bin/ati_temper
index 283a6024..283a6024 100755
--- a/mining/bin/ati_temper
+++ b/btc/mining/bin/ati_temper
diff --git a/mining/bin/cleanup_tmp b/btc/mining/bin/cleanup_tmp
index e1395b19..e1395b19 100755
--- a/mining/bin/cleanup_tmp
+++ b/btc/mining/bin/cleanup_tmp
diff --git a/mining/bin/ensure-router b/btc/mining/bin/ensure-router
index 5eedabc9..5eedabc9 100755
--- a/mining/bin/ensure-router
+++ b/btc/mining/bin/ensure-router
diff --git a/mining/bin/ensure-wlan0 b/btc/mining/bin/ensure-wlan0
index fa92c4f5..fa92c4f5 100755
--- a/mining/bin/ensure-wlan0
+++ b/btc/mining/bin/ensure-wlan0
diff --git a/mining/poll_btcguild b/btc/mining/poll_btcguild
index 92a02657..92a02657 100644
--- a/mining/poll_btcguild
+++ b/btc/mining/poll_btcguild
diff --git a/mining/user/.config/autostart/startup.desktop b/btc/mining/user/.config/autostart/startup.desktop
index 67c35ef8..67c35ef8 100644
--- a/mining/user/.config/autostart/startup.desktop
+++ b/btc/mining/user/.config/autostart/startup.desktop
diff --git a/mining/user/mining.ovdr b/btc/mining/user/mining.ovdr
index d6cf6fec..d6cf6fec 100644
--- a/mining/user/mining.ovdr
+++ b/btc/mining/user/mining.ovdr
diff --git a/mining/user/startup.sh b/btc/mining/user/startup.sh
index 6274a892..6274a892 100755
--- a/mining/user/startup.sh
+++ b/btc/mining/user/startup.sh
diff --git a/mtgox/mtgox.getDepth b/btc/mtgox/mtgox.getDepth
index 9a607979..9a607979 100755
--- a/mtgox/mtgox.getDepth
+++ b/btc/mtgox/mtgox.getDepth
diff --git a/mtgox/mtgox.getTrades b/btc/mtgox/mtgox.getTrades
index 73e5a68d..73e5a68d 100755
--- a/mtgox/mtgox.getTrades
+++ b/btc/mtgox/mtgox.getTrades
diff --git a/mtgox/mtgox.ticker b/btc/mtgox/mtgox.ticker
index b24dfb35..b24dfb35 100755
--- a/mtgox/mtgox.ticker
+++ b/btc/mtgox/mtgox.ticker
diff --git a/kachelmann/.conditions.swp b/kachelmann/.conditions.swp
new file mode 100644
index 00000000..a7b2f79d
--- /dev/null
+++ b/kachelmann/.conditions.swp
diff --git a/kachelmann/.gitignore b/kachelmann/.gitignore
new file mode 100644
index 00000000..050dfb2e
--- /dev/null
+++ b/kachelmann/.gitignore
@@ -0,0 +1,2 @@
+conditions.pl
+.*.swp
diff --git a/kachelmann/changes b/kachelmann/changes
new file mode 100644
index 00000000..dfd22b64
--- /dev/null
+++ b/kachelmann/changes
@@ -0,0 +1,31 @@
+#!/usr/bin/perl
+use XML::Simple;
+my $xml = new XML::Simple;
+my $data_new = undef;
+my $data_old = undef;
+
+
+&startup;
+while (true) {
+    if($status_new != $status_old){
+        system("espeak -v de \"Das Wetter hat sich von $status_old in $status_new verändert\"");
+    }
+    sleep(300);
+    &get_status;
+}
+
+
+# The startup sub is used to get the first weather state. it should only be used on startup. sorry.
+sub startup(){
+    system("w3m -dump \"http://www.google.com/ig/api?weather=70327-stuttgart&hl=de\" > /tmp/kachelmann/weather.xml");
+    $data_new = $xml->XMLin("/tmp/kachelmann/weather.xml");
+    $data_new = $data_new->{weather}->{current_conditions}->{condition}->{data};
+}
+
+# The get_status sub moves the current data to $data_old and then gets a new one from Googles API
+sub get_status(){
+    system("w3m -dump \"http://www.google.com/ig/api?weather=70327-stuttgart&hl=de\" > /tmp/kachelmann/weather.xml");
+    $data_old = $data_new;
+    $data_new = $xml->XMLin("/tmp/kachelmann/weather.xml");
+    $data_new = $data_new->{weather}->{current_conditions}->{condition}->{data};
+}
diff --git a/kachelmann/conditions b/kachelmann/conditions
index 1a798e42..ea4ba5ca 100755
--- a/kachelmann/conditions
+++ b/kachelmann/conditions
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 use XML::Simple;
-system("w3m -dump \"http://www.google.com/ig/api?weather=70327-stuttgart&hl=de\" > /tmp/kachelmann/weather.xml");
+my $result = `w3m -dump "http://www.google.com/ig/api?weather=70327-stuttgart&hl=de"`;
 my $xml = new XML::Simple;
-my $data = $xml->XMLin("/tmp/kachelmann/weather.xml");
-my $sentence = "Die Wetterkondition ist: $data->{weather}->{current_conditions}->{condition}->{data}\n bei $data->{weather}->{current_conditions}->{temp_c}->{data} Grad Zelsius\n";
-system("espeak -v de \"$sentence\"");
+my $data = $xml->XMLin($result);
+print ("Die Wetterkondition ist: $data->{weather}->{current_conditions}->{condition}->{data}\n bei $data->{weather}->{current_conditions}->{temp_c}->{data} Grad Zelsius\n");
diff --git a/kachelmann/conditions.pl b/kachelmann/conditions.pl
deleted file mode 100755
index 6d8b5541..00000000
--- a/kachelmann/conditions.pl
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/perl
-use XML::Simple;
-system("w3m -dump \"http://www.google.com/ig/api?weather=70327-stuttgart&hl=de\" > /tmp/kachelmann/weather.xml");
-my $xml = new XML::Simple;
-my $data = $xml->XMLin("/tmp/kachelmann/weather.xml");
-my $sentence = "Die Wetterkondition ist: $data->{weather}->{current_conditions}->{condition}->{data}\n bei $data->{weather}->{current_conditions}->{temp_c}->{data} Grad Celsius\n";
-system("espeak \"$sentence\"");
diff --git a/util/bin/galileo b/util/bin/galileo
index 8ca7d834..854f1302 100755
--- a/util/bin/galileo
+++ b/util/bin/galileo
@@ -1,2 +1,3 @@
 #!/bin/sh
-./wiki.firstpar http://de.m.wikipedia.org/wiki/::Random | xargs ./naturalvoices.att 
+export voice=klara
+./wiki.firstpar http://de.m.wikipedia.org/wiki/::Random | xargs  ./naturalvoices.att