From 2aa05b3f9dc82b1f87677871a753ab5630aba007 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 6 Aug 2011 00:56:37 +0200 Subject: assimilator: add git-clone-into --- refactory/bin/git-clone-into | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100755 refactory/bin/git-clone-into diff --git a/refactory/bin/git-clone-into b/refactory/bin/git-clone-into new file mode 100755 index 00000000..67e820e6 --- /dev/null +++ b/refactory/bin/git-clone-into @@ -0,0 +1,48 @@ +#! /bin/sh +# +# usage: git-clone-into repository directory +# +set -euf + +tempdir() { + set -- `tempnam $1` + mkdir $1 + echo $1 +} + +## [prefix] -> tempnam +tempnam() { + until set -- $1 ${1-}`candnam` && ! test -e $2; do :; done + echo $2 +} + +candnam() { + uuidgen 2>/dev/null || date +%s%N +} + + + + tmp_remote=`candnam` + tmp_branch=`candnam` + + subdir=$2 + if test -e $subdir; then + echo 'You are made of stupid!' >&2 + exit 23 + fi + tmpdir=`tempdir /tmp/tempdir-` + #trap "test -d $tmpdir && rm -vfR $tmpdir" EXIT + trap "test -d $tmpdir && rm -fR $tmpdir" EXIT + repository="${1-$repository}" + git clone "$repository" $tmpdir + (cd $tmpdir + subdir="$subdir" git filter-branch --tree-filter ' + if ! test -d $subdir; then + mkdir -p $subdir + git ls-tree -z --name-only $GIT_COMMIT | xargs -I. --null mv . $subdir + fi + ' + git checkout -b $tmp_branch) + git remote add $tmp_remote $tmpdir + git fetch $tmp_remote + git merge $tmp_remote/$tmp_branch # TODO configurable branch -- cgit v1.2.3 From bc4793371f7bc881de6e772252368cfe342542d3 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 6 Aug 2011 00:56:37 +0200 Subject: assimilator: add git-clone-into --- refactory/bin/git-clone-into | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100755 refactory/bin/git-clone-into diff --git a/refactory/bin/git-clone-into b/refactory/bin/git-clone-into new file mode 100755 index 00000000..67e820e6 --- /dev/null +++ b/refactory/bin/git-clone-into @@ -0,0 +1,48 @@ +#! /bin/sh +# +# usage: git-clone-into repository directory +# +set -euf + +tempdir() { + set -- `tempnam $1` + mkdir $1 + echo $1 +} + +## [prefix] -> tempnam +tempnam() { + until set -- $1 ${1-}`candnam` && ! test -e $2; do :; done + echo $2 +} + +candnam() { + uuidgen 2>/dev/null || date +%s%N +} + + + + tmp_remote=`candnam` + tmp_branch=`candnam` + + subdir=$2 + if test -e $subdir; then + echo 'You are made of stupid!' >&2 + exit 23 + fi + tmpdir=`tempdir /tmp/tempdir-` + #trap "test -d $tmpdir && rm -vfR $tmpdir" EXIT + trap "test -d $tmpdir && rm -fR $tmpdir" EXIT + repository="${1-$repository}" + git clone "$repository" $tmpdir + (cd $tmpdir + subdir="$subdir" git filter-branch --tree-filter ' + if ! test -d $subdir; then + mkdir -p $subdir + git ls-tree -z --name-only $GIT_COMMIT | xargs -I. --null mv . $subdir + fi + ' + git checkout -b $tmp_branch) + git remote add $tmp_remote $tmpdir + git fetch $tmp_remote + git merge $tmp_remote/$tmp_branch # TODO configurable branch -- cgit v1.2.3 From 1a6b35c1bee9582ac0d2e899fd8d0c26386a1fb8 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 6 Aug 2011 00:59:46 +0200 Subject: cholerab README: add conflicts --- cholerab/README | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cholerab/README b/cholerab/README index d6149751..7b53aeaa 100644 --- a/cholerab/README +++ b/cholerab/README @@ -61,3 +61,12 @@ - i.e. to start automatically at KREBS - the last stream should be playbacked - should be controlable by noise [see NOISE-STREAM-MODULE] + + +## merge conflicts below +view.py: contains view classes for cholerab +cholerab.py: main file + +start with : +python cholerab.py + -- cgit v1.2.3 From 0bdfff5506795d5603712e3333ebe44122db8e31 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 6 Aug 2011 00:59:46 +0200 Subject: cholerab README: add conflicts --- cholerab/README | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cholerab/README b/cholerab/README index d6149751..7b53aeaa 100644 --- a/cholerab/README +++ b/cholerab/README @@ -61,3 +61,12 @@ - i.e. to start automatically at KREBS - the last stream should be playbacked - should be controlable by noise [see NOISE-STREAM-MODULE] + + +## merge conflicts below +view.py: contains view classes for cholerab +cholerab.py: main file + +start with : +python cholerab.py + -- cgit v1.2.3 From ccd029afd79fc6155d2c04e37584e11cdd463913 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 6 Aug 2011 01:27:55 +0200 Subject: Fixed the Makefile and renamed conditions.pl to conditions --- kachelmann/Makefile | 5 +++-- kachelmann/conditions | 7 +++++++ kachelmann/weather.xml | 1 - 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100755 kachelmann/conditions delete mode 100644 kachelmann/weather.xml diff --git a/kachelmann/Makefile b/kachelmann/Makefile index 277a5421..813f4dec 100644 --- a/kachelmann/Makefile +++ b/kachelmann/Makefile @@ -1,5 +1,6 @@ .PHONY: infect -INSTALL_DIR = /root/bin +INSTALL_DIR = /root/bin/ infect: mkdir -p /tmp/kachelmann/ - cp kachelmann ${INSTALL_DIR} + cp conditions ${INSTALL_DIR} + chmod +x ${INSTALL_DIR}conditions diff --git a/kachelmann/conditions b/kachelmann/conditions new file mode 100755 index 00000000..6d8b5541 --- /dev/null +++ b/kachelmann/conditions @@ -0,0 +1,7 @@ +#!/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/weather.xml b/kachelmann/weather.xml deleted file mode 100644 index 8a785308..00000000 --- a/kachelmann/weather.xml +++ /dev/null @@ -1 +0,0 @@ - -- cgit v1.2.3 From 4500675b3871a5683e08f4c7de4d69c5a1a0b3d7 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 6 Aug 2011 01:27:55 +0200 Subject: Fixed the Makefile and renamed conditions.pl to conditions --- kachelmann/Makefile | 5 +++-- kachelmann/conditions | 7 +++++++ kachelmann/weather.xml | 1 - 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100755 kachelmann/conditions delete mode 100644 kachelmann/weather.xml diff --git a/kachelmann/Makefile b/kachelmann/Makefile index 277a5421..813f4dec 100644 --- a/kachelmann/Makefile +++ b/kachelmann/Makefile @@ -1,5 +1,6 @@ .PHONY: infect -INSTALL_DIR = /root/bin +INSTALL_DIR = /root/bin/ infect: mkdir -p /tmp/kachelmann/ - cp kachelmann ${INSTALL_DIR} + cp conditions ${INSTALL_DIR} + chmod +x ${INSTALL_DIR}conditions diff --git a/kachelmann/conditions b/kachelmann/conditions new file mode 100755 index 00000000..6d8b5541 --- /dev/null +++ b/kachelmann/conditions @@ -0,0 +1,7 @@ +#!/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/weather.xml b/kachelmann/weather.xml deleted file mode 100644 index 8a785308..00000000 --- a/kachelmann/weather.xml +++ /dev/null @@ -1 +0,0 @@ - -- cgit v1.2.3 From 367c14aaa85a133178665ea6dcb3d55e20c17189 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 6 Aug 2011 01:31:44 +0200 Subject: Mde the Makefile to rename conditions to kachelmann in /root/bin --- kachelmann/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kachelmann/Makefile b/kachelmann/Makefile index 813f4dec..7fa3ec2d 100644 --- a/kachelmann/Makefile +++ b/kachelmann/Makefile @@ -3,4 +3,6 @@ INSTALL_DIR = /root/bin/ infect: mkdir -p /tmp/kachelmann/ cp conditions ${INSTALL_DIR} - chmod +x ${INSTALL_DIR}conditions + mv ${INSTALL_DIR}conditions ${INSTALL_DIR}kachelmann + chmod +x ${INSTALL_DIR}kachelmann + -- cgit v1.2.3 From d9feb2d6431bc4be507998a0086a0f0d1317f8ea Mon Sep 17 00:00:00 2001 From: root Date: Sat, 6 Aug 2011 01:31:44 +0200 Subject: Mde the Makefile to rename conditions to kachelmann in /root/bin --- kachelmann/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kachelmann/Makefile b/kachelmann/Makefile index 813f4dec..7fa3ec2d 100644 --- a/kachelmann/Makefile +++ b/kachelmann/Makefile @@ -3,4 +3,6 @@ INSTALL_DIR = /root/bin/ infect: mkdir -p /tmp/kachelmann/ cp conditions ${INSTALL_DIR} - chmod +x ${INSTALL_DIR}conditions + mv ${INSTALL_DIR}conditions ${INSTALL_DIR}kachelmann + chmod +x ${INSTALL_DIR}kachelmann + -- cgit v1.2.3 From c6dca15dfdc28b308bb612c714a08982da60e4de Mon Sep 17 00:00:00 2001 From: root Date: Sat, 6 Aug 2011 01:34:09 +0200 Subject: Made kachelmann speak german --- kachelmann/conditions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kachelmann/conditions b/kachelmann/conditions index 6d8b5541..9880b397 100755 --- a/kachelmann/conditions +++ b/kachelmann/conditions @@ -4,4 +4,4 @@ system("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 Celsius\n"; -system("espeak \"$sentence\""); +system("espeak -v de \"$sentence\""); -- cgit v1.2.3 From 370d97f0a8e92be059ba4bcf3a4934c1e030a327 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 6 Aug 2011 01:34:09 +0200 Subject: Made kachelmann speak german --- kachelmann/conditions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kachelmann/conditions b/kachelmann/conditions index 6d8b5541..9880b397 100755 --- a/kachelmann/conditions +++ b/kachelmann/conditions @@ -4,4 +4,4 @@ system("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 Celsius\n"; -system("espeak \"$sentence\""); +system("espeak -v de \"$sentence\""); -- cgit v1.2.3 From 09ad78979c2492eaf9b907ea46d871b2c9a5736e Mon Sep 17 00:00:00 2001 From: root Date: Sat, 6 Aug 2011 01:36:29 +0200 Subject: Edited the output so espeak can pronounce it --- kachelmann/conditions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kachelmann/conditions b/kachelmann/conditions index 9880b397..1a798e42 100755 --- a/kachelmann/conditions +++ b/kachelmann/conditions @@ -3,5 +3,5 @@ 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"; +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\""); -- cgit v1.2.3 From 0330d4071b4db787129f2a94fab5b1b8c12f3b20 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 6 Aug 2011 01:36:29 +0200 Subject: Edited the output so espeak can pronounce it --- kachelmann/conditions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kachelmann/conditions b/kachelmann/conditions index 9880b397..1a798e42 100755 --- a/kachelmann/conditions +++ b/kachelmann/conditions @@ -3,5 +3,5 @@ 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"; +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\""); -- cgit v1.2.3 From bac5e7c6d078c2c4b6c08d3feb82bf018901db6a Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 6 Aug 2011 01:50:40 +0200 Subject: infest skel motd: use krebs-v2f --- infest/skel/etc/motd.tail | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/infest/skel/etc/motd.tail b/infest/skel/etc/motd.tail index 0e685c01..0b5dfcff 100644 --- a/infest/skel/etc/motd.tail +++ b/infest/skel/etc/motd.tail @@ -1,10 +1,14 @@ KREBS PAINLOAD (MORE COBRA) - x x x x - xx xx xx xx xx xx - xx xx xx xx xx xx - xxx x x xxx - x xxxxxxxxxxxx x - xxxxxxxxxxxxxxxx - x xxxxxxxxxxxx x - x x x x x x - x x x x x x +             +                          +                          +                     +                          +                      +                            +                +                        +              +                   +                   +                        -- cgit v1.2.3 From 6fc9902d03f146b77dca97506fd83ea773d6117c Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 6 Aug 2011 01:50:40 +0200 Subject: infest skel motd: use krebs-v2f --- infest/skel/etc/motd.tail | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/infest/skel/etc/motd.tail b/infest/skel/etc/motd.tail index 0e685c01..0b5dfcff 100644 --- a/infest/skel/etc/motd.tail +++ b/infest/skel/etc/motd.tail @@ -1,10 +1,14 @@ KREBS PAINLOAD (MORE COBRA) - x x x x - xx xx xx xx xx xx - xx xx xx xx xx xx - xxx x x xxx - x xxxxxxxxxxxx x - xxxxxxxxxxxxxxxx - x xxxxxxxxxxxx x - x x x x x x - x x x x x x +             +                          +                          +                     +                          +                      +                            +                +                        +              +                   +                   +                        -- cgit v1.2.3 From 5485e37b46024d85cb38ca1af7e687aeac131864 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 6 Aug 2011 02:05:36 +0200 Subject: beep.lol: final commit --- beep.lol | 1 - 1 file changed, 1 deletion(-) delete mode 100755 beep.lol 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 -- cgit v1.2.3 From d7a46958ec661c3024ff20a469a824fdd0d3d5fa Mon Sep 17 00:00:00 2001 From: root Date: Sat, 6 Aug 2011 02:05:36 +0200 Subject: beep.lol: final commit --- beep.lol | 1 - 1 file changed, 1 deletion(-) delete mode 100755 beep.lol 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 -- cgit v1.2.3 From 70a678bc981d3fd5c522634debd2b4dc09c36581 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 6 Aug 2011 02:31:31 +0200 Subject: git-eternal-move: add to wrong location --- refactory/bin/git-eternal-move | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 refactory/bin/git-eternal-move diff --git a/refactory/bin/git-eternal-move b/refactory/bin/git-eternal-move new file mode 100755 index 00000000..075748fd --- /dev/null +++ b/refactory/bin/git-eternal-move @@ -0,0 +1,11 @@ +#! /bin/sh +# +# git-eternal-move FROM TO +# +set -euf +git filter-branch --tree-filter " + set -euf + if test -e '$1'; then + mkdir -p '`dirname "$2"`' + mv '$1' '$2' + fi" -- cgit v1.2.3 From 280409f3e359983655633a4397a76f13c4f41ef0 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 6 Aug 2011 02:31:31 +0200 Subject: git-eternal-move: add to wrong location --- refactory/bin/git-eternal-move | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 refactory/bin/git-eternal-move diff --git a/refactory/bin/git-eternal-move b/refactory/bin/git-eternal-move new file mode 100755 index 00000000..075748fd --- /dev/null +++ b/refactory/bin/git-eternal-move @@ -0,0 +1,11 @@ +#! /bin/sh +# +# git-eternal-move FROM TO +# +set -euf +git filter-branch --tree-filter " + set -euf + if test -e '$1'; then + mkdir -p '`dirname "$2"`' + mv '$1' '$2' + fi" -- cgit v1.2.3 From 3b471187be33af12a1eb6fb37195fd0fce7f6fd2 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 6 Aug 2011 02:31:31 +0200 Subject: git-eternal-move: add to wrong location --- refactory/bin/git-eternal-move | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 refactory/bin/git-eternal-move diff --git a/refactory/bin/git-eternal-move b/refactory/bin/git-eternal-move new file mode 100755 index 00000000..075748fd --- /dev/null +++ b/refactory/bin/git-eternal-move @@ -0,0 +1,11 @@ +#! /bin/sh +# +# git-eternal-move FROM TO +# +set -euf +git filter-branch --tree-filter " + set -euf + if test -e '$1'; then + mkdir -p '`dirname "$2"`' + mv '$1' '$2' + fi" -- cgit v1.2.3 From 5f321f04a74873652d5a9afeb7574fbafda0c429 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 6 Aug 2011 02:31:31 +0200 Subject: git-eternal-move: add to wrong location --- refactory/bin/git-eternal-move | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 refactory/bin/git-eternal-move diff --git a/refactory/bin/git-eternal-move b/refactory/bin/git-eternal-move new file mode 100755 index 00000000..075748fd --- /dev/null +++ b/refactory/bin/git-eternal-move @@ -0,0 +1,11 @@ +#! /bin/sh +# +# git-eternal-move FROM TO +# +set -euf +git filter-branch --tree-filter " + set -euf + if test -e '$1'; then + mkdir -p '`dirname "$2"`' + mv '$1' '$2' + fi" -- cgit v1.2.3 From 5d14d901eaaf886ef7ab029587e1611bcfa3233c Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 6 Aug 2011 02:37:54 +0200 Subject: git-eternal-move: check $# --- refactory/bin/git-eternal-move | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/refactory/bin/git-eternal-move b/refactory/bin/git-eternal-move index 075748fd..bcf79501 100755 --- a/refactory/bin/git-eternal-move +++ b/refactory/bin/git-eternal-move @@ -3,9 +3,12 @@ # git-eternal-move FROM TO # set -euf -git filter-branch --tree-filter " +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 '`dirname "$2"`' mv '$1' '$2' fi" -- cgit v1.2.3 From 13cb53db7571626234d704e6589ed836a99d0512 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 6 Aug 2011 02:37:54 +0200 Subject: git-eternal-move: check $# --- refactory/bin/git-eternal-move | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/refactory/bin/git-eternal-move b/refactory/bin/git-eternal-move index 075748fd..bcf79501 100755 --- a/refactory/bin/git-eternal-move +++ b/refactory/bin/git-eternal-move @@ -3,9 +3,12 @@ # git-eternal-move FROM TO # set -euf -git filter-branch --tree-filter " +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 '`dirname "$2"`' mv '$1' '$2' fi" -- cgit v1.2.3 From 71847586426ce474c9bcc22cf536cc4018549b5c Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 6 Aug 2011 02:37:54 +0200 Subject: git-eternal-move: check $# --- refactory/bin/git-eternal-move | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/refactory/bin/git-eternal-move b/refactory/bin/git-eternal-move index 075748fd..bcf79501 100755 --- a/refactory/bin/git-eternal-move +++ b/refactory/bin/git-eternal-move @@ -3,9 +3,12 @@ # git-eternal-move FROM TO # set -euf -git filter-branch --tree-filter " +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 '`dirname "$2"`' mv '$1' '$2' fi" -- cgit v1.2.3 From 61a7d2057549775a8e18362b46b27a72bca36268 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 6 Aug 2011 02:37:54 +0200 Subject: git-eternal-move: check $# --- refactory/bin/git-eternal-move | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/refactory/bin/git-eternal-move b/refactory/bin/git-eternal-move index 075748fd..bcf79501 100755 --- a/refactory/bin/git-eternal-move +++ b/refactory/bin/git-eternal-move @@ -3,9 +3,12 @@ # git-eternal-move FROM TO # set -euf -git filter-branch --tree-filter " +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 '`dirname "$2"`' mv '$1' '$2' fi" -- cgit v1.2.3 From b0b67aed6c880ef0c82049b73f5bdc689c35e6d3 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 6 Aug 2011 02:38:50 +0200 Subject: git-eternal-move: $2 is interpreted as dir --- refactory/bin/git-eternal-move | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/refactory/bin/git-eternal-move b/refactory/bin/git-eternal-move index bcf79501..50361e7b 100755 --- a/refactory/bin/git-eternal-move +++ b/refactory/bin/git-eternal-move @@ -1,6 +1,6 @@ #! /bin/sh # -# git-eternal-move FROM TO +# git-eternal-move FROM TO-DIRECTORY # set -euf if test $# -ne 2; then @@ -10,5 +10,6 @@ fi exec git filter-branch --tree-filter " set -euf if test -e '$1'; then + mkdir -p '$2' mv '$1' '$2' fi" -- cgit v1.2.3 From 17e9c1ec745cb8ee8ac37c4f88bfc103d05b8d63 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 6 Aug 2011 02:38:50 +0200 Subject: git-eternal-move: $2 is interpreted as dir --- refactory/bin/git-eternal-move | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/refactory/bin/git-eternal-move b/refactory/bin/git-eternal-move index bcf79501..50361e7b 100755 --- a/refactory/bin/git-eternal-move +++ b/refactory/bin/git-eternal-move @@ -1,6 +1,6 @@ #! /bin/sh # -# git-eternal-move FROM TO +# git-eternal-move FROM TO-DIRECTORY # set -euf if test $# -ne 2; then @@ -10,5 +10,6 @@ fi exec git filter-branch --tree-filter " set -euf if test -e '$1'; then + mkdir -p '$2' mv '$1' '$2' fi" -- cgit v1.2.3 From 594f202da6dc4526e4bde6c9b43ad9dc8e6cd0be Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 6 Aug 2011 02:38:50 +0200 Subject: git-eternal-move: $2 is interpreted as dir --- refactory/bin/git-eternal-move | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/refactory/bin/git-eternal-move b/refactory/bin/git-eternal-move index bcf79501..50361e7b 100755 --- a/refactory/bin/git-eternal-move +++ b/refactory/bin/git-eternal-move @@ -1,6 +1,6 @@ #! /bin/sh # -# git-eternal-move FROM TO +# git-eternal-move FROM TO-DIRECTORY # set -euf if test $# -ne 2; then @@ -10,5 +10,6 @@ fi exec git filter-branch --tree-filter " set -euf if test -e '$1'; then + mkdir -p '$2' mv '$1' '$2' fi" -- cgit v1.2.3 From a1846a29952e477d3dcf395c527faf99b1c86805 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 6 Aug 2011 02:38:50 +0200 Subject: git-eternal-move: $2 is interpreted as dir --- refactory/bin/git-eternal-move | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/refactory/bin/git-eternal-move b/refactory/bin/git-eternal-move index bcf79501..50361e7b 100755 --- a/refactory/bin/git-eternal-move +++ b/refactory/bin/git-eternal-move @@ -1,6 +1,6 @@ #! /bin/sh # -# git-eternal-move FROM TO +# git-eternal-move FROM TO-DIRECTORY # set -euf if test $# -ne 2; then @@ -10,5 +10,6 @@ fi exec git filter-branch --tree-filter " set -euf if test -e '$1'; then + mkdir -p '$2' mv '$1' '$2' fi" -- cgit v1.2.3 From 6ead6dc58a2d7eeb6800a9f232e2272e74c37549 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 6 Aug 2011 03:00:03 +0200 Subject: assimilator: and it's gone --- assimilator/bin/git-clone-into | 48 ------------------------------------------ 1 file changed, 48 deletions(-) delete mode 100755 assimilator/bin/git-clone-into diff --git a/assimilator/bin/git-clone-into b/assimilator/bin/git-clone-into deleted file mode 100755 index 67e820e6..00000000 --- a/assimilator/bin/git-clone-into +++ /dev/null @@ -1,48 +0,0 @@ -#! /bin/sh -# -# usage: git-clone-into repository directory -# -set -euf - -tempdir() { - set -- `tempnam $1` - mkdir $1 - echo $1 -} - -## [prefix] -> tempnam -tempnam() { - until set -- $1 ${1-}`candnam` && ! test -e $2; do :; done - echo $2 -} - -candnam() { - uuidgen 2>/dev/null || date +%s%N -} - - - - tmp_remote=`candnam` - tmp_branch=`candnam` - - subdir=$2 - if test -e $subdir; then - echo 'You are made of stupid!' >&2 - exit 23 - fi - tmpdir=`tempdir /tmp/tempdir-` - #trap "test -d $tmpdir && rm -vfR $tmpdir" EXIT - trap "test -d $tmpdir && rm -fR $tmpdir" EXIT - repository="${1-$repository}" - git clone "$repository" $tmpdir - (cd $tmpdir - subdir="$subdir" git filter-branch --tree-filter ' - if ! test -d $subdir; then - mkdir -p $subdir - git ls-tree -z --name-only $GIT_COMMIT | xargs -I. --null mv . $subdir - fi - ' - git checkout -b $tmp_branch) - git remote add $tmp_remote $tmpdir - git fetch $tmp_remote - git merge $tmp_remote/$tmp_branch # TODO configurable branch -- cgit v1.2.3 From f80af89ad16a1107532456b21eb5a75b39cbade1 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 6 Aug 2011 03:00:03 +0200 Subject: assimilator: and it's gone --- assimilator/bin/git-clone-into | 48 ------------------------------------------ 1 file changed, 48 deletions(-) delete mode 100755 assimilator/bin/git-clone-into diff --git a/assimilator/bin/git-clone-into b/assimilator/bin/git-clone-into deleted file mode 100755 index 67e820e6..00000000 --- a/assimilator/bin/git-clone-into +++ /dev/null @@ -1,48 +0,0 @@ -#! /bin/sh -# -# usage: git-clone-into repository directory -# -set -euf - -tempdir() { - set -- `tempnam $1` - mkdir $1 - echo $1 -} - -## [prefix] -> tempnam -tempnam() { - until set -- $1 ${1-}`candnam` && ! test -e $2; do :; done - echo $2 -} - -candnam() { - uuidgen 2>/dev/null || date +%s%N -} - - - - tmp_remote=`candnam` - tmp_branch=`candnam` - - subdir=$2 - if test -e $subdir; then - echo 'You are made of stupid!' >&2 - exit 23 - fi - tmpdir=`tempdir /tmp/tempdir-` - #trap "test -d $tmpdir && rm -vfR $tmpdir" EXIT - trap "test -d $tmpdir && rm -fR $tmpdir" EXIT - repository="${1-$repository}" - git clone "$repository" $tmpdir - (cd $tmpdir - subdir="$subdir" git filter-branch --tree-filter ' - if ! test -d $subdir; then - mkdir -p $subdir - git ls-tree -z --name-only $GIT_COMMIT | xargs -I. --null mv . $subdir - fi - ' - git checkout -b $tmp_branch) - git remote add $tmp_remote $tmpdir - git fetch $tmp_remote - git merge $tmp_remote/$tmp_branch # TODO configurable branch -- cgit v1.2.3 From c1ac7524bdf08d1f9d5bbcb3f9b7cb979f76a8c6 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 6 Aug 2011 03:09:45 +0200 Subject: ${btc-stuff} -> btc/ --- btcguild/index.js | 20 -------- mining/CONFIGURE | 8 --- mining/Makefile | 20 -------- mining/README | 9 ---- mining/TODO | 2 - mining/bin/archlinux-cruise-control | 70 --------------------------- mining/bin/ati_temper | 5 -- mining/bin/cleanup_tmp | 4 -- mining/bin/ensure-router | 36 -------------- mining/bin/ensure-wlan0 | 41 ---------------- mining/poll_btcguild | 2 - mining/user/.config/autostart/startup.desktop | 6 --- mining/user/mining.ovdr | 16 ------ mining/user/startup.sh | 13 ----- mtgox/mtgox.getDepth | 3 -- mtgox/mtgox.getTrades | 3 -- mtgox/mtgox.ticker | 4 -- 17 files changed, 262 deletions(-) delete mode 100644 btcguild/index.js delete mode 100644 mining/CONFIGURE delete mode 100644 mining/Makefile delete mode 100644 mining/README delete mode 100644 mining/TODO delete mode 100755 mining/bin/archlinux-cruise-control delete mode 100755 mining/bin/ati_temper delete mode 100755 mining/bin/cleanup_tmp delete mode 100755 mining/bin/ensure-router delete mode 100755 mining/bin/ensure-wlan0 delete mode 100644 mining/poll_btcguild delete mode 100644 mining/user/.config/autostart/startup.desktop delete mode 100644 mining/user/mining.ovdr delete mode 100755 mining/user/startup.sh delete mode 100755 mtgox/mtgox.getDepth delete mode 100755 mtgox/mtgox.getTrades delete mode 100755 mtgox/mtgox.ticker diff --git a/btcguild/index.js b/btcguild/index.js deleted file mode 100644 index 1f33db06..00000000 --- a/btcguild/index.js +++ /dev/null @@ -1,20 +0,0 @@ -api_key = process.env.api_key; - -var options = { - host: 'www.btcguild.com', - port: 80, - path: '/api.php?api_key=' + api_key -}; - -http = require('http'); -http.get(options, function(res) { - var data = ''; - res.on('data', function (chunk) { - data += chunk; - }); - res.on('end', function () { - console.log(JSON.parse(data)); - }); -}).on('error', function(e) { - console.error('Error: ' + e.message); -}); diff --git a/mining/CONFIGURE b/mining/CONFIGURE deleted file mode 100644 index 299cbd53..00000000 --- a/mining/CONFIGURE +++ /dev/null @@ -1,8 +0,0 @@ -How to Configure -=============== - -1. change the mining-url in ~/startup.sh -2. in KDE - 'AMDOverdriveCtrl - configure profile -3. in KDE-Autostart - activate the startup script -2. sudo /etc/init.d/gdm restart - diff --git a/mining/Makefile b/mining/Makefile deleted file mode 100644 index 8701920f..00000000 --- a/mining/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -.PHONY: all format install configure -select-target: - @echo "You are made of stupid!" - echo "look here" - @cat Makefile -format: - cat README -fix-linucCoin: configure - apt-get install --yes lm-sensors tmux - echo '#!/bin/bash' > /usr/bin/ati_license - echo '#!/bin/sh' > /etc/init.d/live-boot - echo 'wall "going down"' >> /etc/init.d/live-boot - chmod 755 /etc/init.d/live-boot - echo 'sudo tar xvf /opt/AMD-APP-SDK-v2.4-lnx64/icd-registration.tgz -C /' >> /usr/bin/ati_license - cp -r user /home -configure: - yes '' | sensors-detect - @cat CONFIGURE -archlinux: - bin/archlinux-cruise-control diff --git a/mining/README b/mining/README deleted file mode 100644 index ad8c3468..00000000 --- a/mining/README +++ /dev/null @@ -1,9 +0,0 @@ -What to do: -format the usb-stick: -Device Boot Start End Blocks Id System -/dev/sda1 * 1 254 976345 c W95 FAT32 (LBA) -/dev/sda2 255 1017 2932972 83 Linux - -1. install coinlinux live system on sda1. -2. mkfs.ext3 /dev/sda2 -L live-rw -3. install grub on /dev/sda diff --git a/mining/TODO b/mining/TODO deleted file mode 100644 index bafaa72a..00000000 --- a/mining/TODO +++ /dev/null @@ -1,2 +0,0 @@ -- fix the sed script in "make archlinux" to replace only the first occurrence -- test the amdoverdrive stuff from the home dir (user) diff --git a/mining/bin/archlinux-cruise-control b/mining/bin/archlinux-cruise-control deleted file mode 100755 index de5a0fa4..00000000 --- a/mining/bin/archlinux-cruise-control +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash -set -euf -export EDITOR=vim -echo "!! ARCHLINUX Cruise Control Mining installer !!" -echo "** adding main network profile" -cp /etc/network.d/examples/ethernet-dhcp /etc/network.d/main -echo 'POST_UP="sed -i \"1i nameserver 8.8.8.8\" /etc/resolv.conf"' >> /etc/network.d/main -echo "** adding worker account" -grep -q worker /etc/passwd || adduser worker -gpasswd -a worker wheel -gpasswd -a worker tty -gpasswd -a worker audio -gpasswd -a worker video -gpasswd -a worker network -gpasswd -a worker power - -echo "** adding archlinuxfr to pacman.conf" -grep -q archlinuxfr /etc/pacman.conf || echo "[archlinuxfr]" >> /etc/pacman.conf && echo "Server = http://repo.archlinux.fr/x86_64" >> /etc/pacman.conf -echo "** installing all the required parts" -pacman --needed --noconfirm -Syu rsync git openssh yajl sudo tmux lm_sensors vim yaourt kernel26-headers beep -echo "** doing some tweaks" -rm /usr/bin/python -f -ln -s /usr/bin/python2 /usr/bin/python -echo "syntax on" > /home/worker/.vimrc -echo "syntax on" > /root/.vimrc -echo "** installing tinc" -[ "`yaourt -Q tinc`" ] || yaourt -S --noconfirm tinc -sed -i -e 's/.*\%wheel.*/%wheel ALL=(ALL) NOPASSWD: ALL/1' /etc/sudoers -echo "** Installing ATI drivers" -[ "`yaourt -Q catalyst-utils`" ] || yaourt -S --noconfirm catalyst-utils -[ "`yaourt -Q catalyst-hook`" ] || yaourt -S --noconfirm catalyst-hook -[ "`yaourt -Q amdstream`" ] || yaourt -S --noconfirm amdstream -echo "** installing X" -pacman --needed -S --noconfirm xorg-server xorg-apps xorg-appres xorg-xinit xautolock xlockmore xorg-fonts xorg-xhost xorg-xauth xterm rxvt-unicode fluxbox slim -echo "** editing slim configuration" -sed -i 's/.*default_user.*/default_user worker/' /etc/slim.conf -sed -i 's/.*auto_login.*/auto_login yes/' /etc/slim.conf -echo "** Installing mining tools and overclocking stuff" -[ "`yaourt -Q phoenix-miner-svn`" ] || yaourt -S --noconfirm phoenix-miner-svn -echo "!! warning, you might need to adjust the version number of AMDOverdriveCTRL !!" -[ "`yaourt -Q amdoverdrivectrl`" ] || yaourt -S amdoverdrivectrl -echo "** copying bin folder" -cp -r $(readlink -f `dirname $0`)/ /home/worker -echo "** creating new .Xauthority for worker" -sudo -u worker /home/worker/bin/newkey.sh -mkdir -p /home/worker/.fluxbox -cp /krebs/mining/user/startup.sh /home/worker/startup.sh -chmod a+x /home/worker/startup.sh -cp /krebs/mining/user/startup.sh /home/worker/.fluxbox/startup -chmod a+x /home/worker/.fluxbox/startup -cp /krebs/mining/user/mining.ovdr /home/worker/ -chown -R worker:users /home/worker -echo "configuring X" -echo "!! ACTION REQUIRED, write down the first number of your ATI Graphics Adapter." -echo "!! i will open /etc/X11/xorg.conf for you, change the BusID of every Device to the numbers you see here" -echo "!! press enter to continue" -lspci|grep VGA -read -aticonfig --initial=dual-head -vim /etc/X11/xorg.conf -echo "** creating xinitrc and start x" -echo 'setxkbmap -option terminate:ctrl_alt_bksp' > /home/worker/.xinitrc -echo 'xautolock -corners +-+- -locker "xlock -mode blank"&' >> /home/worker/.xinitrc -echo '/home/worker/startup.sh &' >> /home/worker/.xinitrc -echo 'xterm &' >> /home/worker/.xinitrc -echo 'exec fluxbox' >> /home/worker/.xinitrc -echo '!! start x with `xinit `' -echo 'add "x:5:respawn:/usr/bin/slim >/dev/null 2>&1" to /etc/inittab to start slim" - - diff --git a/mining/bin/ati_temper b/mining/bin/ati_temper deleted file mode 100755 index 283a6024..00000000 --- a/mining/bin/ati_temper +++ /dev/null @@ -1,5 +0,0 @@ -#displays: CARD1TEMP CARD2TEMP CPUTEMP OUTSIDE -echo -n "`DISPLAY=:0 aticonfig --adapter=1 --od-gettemperature | grep Temperature | sed -n 's/.*Temperature - \([0-9.]*\) C/\1/;p'` " -echo -n "`DISPLAY=:0 aticonfig --adapter=2 --od-gettemperature | grep Temperature | sed -n 's/.*Temperature - \([0-9.]*\) C/\1/;p'` " -echo -n "`sensors | grep temp1 | sed -e 's/temp1: *+\([0-9.]*\).*/\1/'` " -echo "`temper`" diff --git a/mining/bin/cleanup_tmp b/mining/bin/cleanup_tmp deleted file mode 100755 index e1395b19..00000000 --- a/mining/bin/cleanup_tmp +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/sh -ls -lAtr /tmp/ | sed -rn ' - /\.so$/{$!{s/.* ([A-Za-z0-9]+\.so)$/rm -v \/tmp\/\1/p}} -' | sudo sh diff --git a/mining/bin/ensure-router b/mining/bin/ensure-router deleted file mode 100755 index 5eedabc9..00000000 --- a/mining/bin/ensure-router +++ /dev/null @@ -1,36 +0,0 @@ -#! /bin/sh - -if test "${nosudo-false}" != true -a `id -u` != 0; then - echo "we're going sudo..." >&2 - exec sudo "$0" "$@" - exit 23 # go to hell -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; 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 - beep -l 50 -f 2500 -n -l 100 -f 3000 - else - beep -l 50 -f 2500 -n -l 100 -f 1000 - fi -else - case "${1-}" in - (--quiet) : ;; - (*) beep -l 50 -f 2500 -n -l 100 -f 2500 ;; - esac -fi diff --git a/mining/bin/ensure-wlan0 b/mining/bin/ensure-wlan0 deleted file mode 100755 index fa92c4f5..00000000 --- a/mining/bin/ensure-wlan0 +++ /dev/null @@ -1,41 +0,0 @@ -#! /bin/sh - -if test "${nosudo-false}" != true -a `id -u` != 0; then - echo "we're going sudo..." >&2 - exec sudo -E "$0" "$@" - exit 23 # go to hell -fi - -has_internet() { - curl -sS google.com >/dev/null -} - -if test "${force-false}" = true || ! has_internet; then - - ## get rid of the fuckers - for fucker in NetworkManager nm-applet; do - pkill -9 $fucker - (IFS=:; for dir in $PATH; do rm -vf $dir/$fucker; done) - done - - beep -l 50 -f 2000; pkill wpa - beep -l 50 -f 2000; rm -vf /var/run/wpa_supplicant/* - beep -l 50 -f 2000; wpa_supplicant -i wlan0 -c /etc/wpa_supplicant/wpa_supplicant.conf & - while ! wpa_cli status | grep -q wpa_state=COMPLETED; do - beep -l 50 -f 2000 -D 50 -n -l 50 -f 2000 - sleep 1 - done - beep -l 50 -f 2000; dhcpcd -x wlan0 - beep -l 50 -f 2000; dhcpcd wlan0 - #echo nameserver 8.8.8.8 >/etc/resolv.conf - if has_internet; then - beep -l 50 -f 2000 -n -l 100 -f 3000 - else - beep -l 50 -f 2000 -n -l 100 -f 1000 - fi -else - case "${1-}" in - (--quiet) : ;; - (*) beep -l 50 -f 2000 -n -l 100 -f 2000 ;; - esac -fi diff --git a/mining/poll_btcguild b/mining/poll_btcguild deleted file mode 100644 index 92a02657..00000000 --- a/mining/poll_btcguild +++ /dev/null @@ -1,2 +0,0 @@ -API_KEY= -curl http://www.btcguild.com/api.php\?api_key\=${API_KEY} | python -mjson.tool diff --git a/mining/user/.config/autostart/startup.desktop b/mining/user/.config/autostart/startup.desktop deleted file mode 100644 index 67c35ef8..00000000 --- a/mining/user/.config/autostart/startup.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Name=LXDE Autostart -Exec=/home/user/startup.sh -Terminal=true -Type=Application -Categories=Configuration diff --git a/mining/user/mining.ovdr b/mining/user/mining.ovdr deleted file mode 100644 index d6cf6fec..00000000 --- a/mining/user/mining.ovdr +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/mining/user/startup.sh b/mining/user/startup.sh deleted file mode 100755 index 6274a892..00000000 --- a/mining/user/startup.sh +++ /dev/null @@ -1,13 +0,0 @@ -sudo pkill tmux -sleep 5 -source ~/.profile -export DISPLAY=:0 -export URL="${URL-http://txgen_chinaman:lolwut@uk.btcguild.com:8332}" -#export URL="http://txgen:qJrXefWX@bitcoinpool.com:8334" -tmux start-server -tmux new-session -d -s mining -n mining -tmux new-window -t mining:1 'cd ~;AMDOverdriveCtrl -i 0 mining.ovdr' -tmux new-window -t mining:2 'cd ~;AMDOverdriveCtrl -i 3 mining.ovdr' -sleep 5 -tmux new-window -t mining:3 "cd /usr/src/phoenix-miner/; while sleep 1; do sudo ./phoenix.py -u $URL -k phatk DEVICE=0 VECTORS BFI_INT WORKSIZE=256 AGGRESSION=12 FASTLOOPS=false;done" -tmux new-window -t mining:4 "cd /usr/src/phoenix-miner/; while sleep 1; do sudo ./phoenix.py -u $URL -k phatk DEVICE=1 VECTORS BFI_INT WORKSIZE=256 AGGRESSION=12 FASTLOOPS=false;done" diff --git a/mtgox/mtgox.getDepth b/mtgox/mtgox.getDepth deleted file mode 100755 index 9a607979..00000000 --- a/mtgox/mtgox.getDepth +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -# get mtgox market depth -$ curl -ksS https://mtgox.com/code/data/getDepth.php diff --git a/mtgox/mtgox.getTrades b/mtgox/mtgox.getTrades deleted file mode 100755 index 73e5a68d..00000000 --- a/mtgox/mtgox.getTrades +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -# get mtgox last trades -$ curl -ksS https://mtgox.com/code/data/getTrades.phl diff --git a/mtgox/mtgox.ticker b/mtgox/mtgox.ticker deleted file mode 100755 index b24dfb35..00000000 --- a/mtgox/mtgox.ticker +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/sh -# get mtgox ticker data -set -euf -curl -ksS https://mtgox.com/code/data/ticker.php -- cgit v1.2.3