7 files changed, 13 insertions, 51 deletions
diff --git a/kachelmann/.conditions.swp b/kachelmann/.conditions.swp
deleted file mode 100644
index a7b2f79d..00000000
--- a/kachelmann/.conditions.swp
+++ /dev/null
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/Makefile b/kachelmann/Makefile
index 7fa3ec2d..3343d941 100644
--- a/kachelmann/Makefile
+++ b/kachelmann/Makefile
@@ -1,8 +1,7 @@
 .PHONY: infect
-INSTALL_DIR = /root/bin/
-infect:
-		mkdir -p /tmp/kachelmann/
-		cp conditions  ${INSTALL_DIR}
-		mv ${INSTALL_DIR}conditions ${INSTALL_DIR}kachelmann
-		chmod +x ${INSTALL_DIR}kachelmann
+install:
+		# punani -Ei w3m php php-xml-simple
+		ln -s $$PWD/conditions  ../bin/conditions
+		ln -s $$PWD/wetter ../bin/wetter
+		ln -s ${INSTALL_DIR}conditions ${INSTALL_DIR}kachelmann
 
diff --git a/kachelmann/changes b/kachelmann/changes
deleted file mode 100644
index dfd22b64..00000000
--- a/kachelmann/changes
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/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
deleted file mode 100755
index 1a798e42..00000000
--- a/kachelmann/conditions
+++ /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 Zelsius\n";
-system("espeak -v de \"$sentence\"");
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/kachelmann/wetter b/kachelmann/wetter
new file mode 100755
index 00000000..957e13e2
--- /dev/null
+++ b/kachelmann/wetter
@@ -0,0 +1,6 @@
+#!/usr/bin/perl
+use XML::Simple;
+my $result = `w3m -dump "http://www.google.com/ig/api?weather=70327-stuttgart&hl=de"`;
+my $xml = new XML::Simple;
+my $data = $xml->XMLin($result);
+print ("$data->{weather}->{current_conditions}->{condition}->{data} bei $data->{weather}->{current_conditions}->{temp_c}->{data} Grad Zelsius\n");