merged Makefile, install lmsensors AND tmux

10 files changed, 123 insertions, 8 deletions

diff --git a/btcguild/index.js b/btcguild/index.js
new file mode 100644
index 00000000..1f33db06
--- /dev/null
+++ b/btcguild/index.js
@@ -0,0 +1,20 @@
+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/cobra/README b/cobra/README
new file mode 100644
index 00000000..145ecd14
--- /dev/null
+++ b/cobra/README
@@ -0,0 +1,33 @@
+
+# usage
+cobra [target...]
+
+# description
+cobra tries to satisfies all specified targets and all of it dependencies.
+
+# targets
+targets can be a lot of different things, e.g. directories
+
+## dirctory targets
+try to do the right thing when the cobra search path contains a directory
+that contains an index.{js,sh,py,etc.} file.
+
+## cobra search path
+like your sh's PATH
+
+## example: cobra as some kind of make
+$ echo $COBRA_PATH
+.
+$ ls .
+foo/ bar/ baz/
+$ cat foo/cobra.json
+{ "deps": "bar", "baz" }
+$ cat bar/cobra.json
+No such file or directory
+$ cat baz/cobra.json
+No such file or directory
+$ cobra foo
+[cobra bar]
+[cobra baz]
+[cobra foo]
+$ exit
diff --git a/cobra/hello/index.sh b/cobra/hello/index.sh
new file mode 100644
index 00000000..df2dea7c
--- /dev/null
+++ b/cobra/hello/index.sh
@@ -0,0 +1 @@
+echo 'Hello, world!'
diff --git a/cobra/index.sh b/cobra/index.sh
new file mode 100755
index 00000000..1118a823
--- /dev/null
+++ b/cobra/index.sh
@@ -0,0 +1,16 @@
+#! /bin/sh
+set -euf
+trap "echo 'You are made of stupid!' >&2; exit 23" EXIT
+
+COBRA_PATH="${COBRA_PATH-$PWD}"
+
+## main
+for target; do
+  for path in $COBRA_PATH; do
+    if test -d "$path/$target"; then
+      if index="$path/$target/index.sh" && test -f "$index"; then
+        exec /bin/sh "$index"
+      fi
+    fi
+  done
+done
diff --git a/mining/Makefile b/mining/Makefile
index b8ed2f6c..7f1e4a79 100644
--- a/mining/Makefile
+++ b/mining/Makefile
@@ -1,12 +1,18 @@
 .PHONY: all format install
 select-target:
 	@echo "You are made of stupid!"
+	echo "look here"
+	@cat Makefile
 format:
 	cat README
 install:
-	sudo apt-get install tmux
+	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:
-	cat CONFIGURE
+	sensors-detect
+	@cat CONFIGURE
diff --git a/mining/user/bin/ati_temper b/mining/user/bin/ati_temper
new file mode 100755
index 00000000..283a6024
--- /dev/null
+++ b/mining/user/bin/ati_temper
@@ -0,0 +1,5 @@
+#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/user/mining.odvr b/mining/user/mining.ovdr
index d6cf6fec..d6cf6fec 100644
--- a/mining/user/mining.odvr
+++ b/mining/user/mining.ovdr
diff --git a/mining/user/startup.sh b/mining/user/startup.sh
index c330b984..eb2ce13a 100644
--- a/mining/user/startup.sh
+++ b/mining/user/startup.sh
@@ -3,7 +3,7 @@ sudo pkill tmux
 sleep 1
 export DISPLAY=:0
 
-export URL="http://txgen_chinaman:lolwut@uk.btcguild.com:8332"
+export URL="${URL-http://txgen_chinaman:lolwut@uk.btcguild.com:8332}"
 #export URL="http://txgen:qJrXefWX@bitcoinpool.com:8334"
 slock &
 tmux start-server
diff --git a/node/Makefile b/node/Makefile
index 00e27b6f..20e15c70 100644
--- a/node/Makefile
+++ b/node/Makefile
@@ -1,8 +1,24 @@
 
 
-.PHONY: all
-all: node-v0.4.8
-	cd $< && ./configure && make && make install
+.PHONY: all build install
 
-node-%:
-	cur http://nodejs.org/dist/$@.tar.gz | tar zx
+all:
+	@echo "You are made of stupid!"; exit 23
+
+build: node node/build/default/node
+	cd node && ./configure && make
+
+install: build
+	cd node && make install
+
+node: node-git
+	ln -vsnf $< $@
+
+node-git:
+	git clone https://github.com/joyent/node node-git
+
+node-%: /usr/bin/curl
+	curl http://nodejs.org/dist/$@.tar.gz | tar zx
+
+/usr/bin/curl:
+	apt-get install --yes curl
diff --git a/retiolum/bin/install b/retiolum/bin/install
new file mode 100755
index 00000000..9e4459fb
--- /dev/null
+++ b/retiolum/bin/install
@@ -0,0 +1,18 @@
+#! /bin/sh
+#
+#
+#
+set -euf
+
+trap 'echo "${comment+$comment
+}You are made of stupid!">&2; exit 23' EXIT
+
+if ! test -e /usr/sbin/tincd; then
+  if grep -iq ubuntu /etc/issue; then
+    sudo apt-get install --yes tinc
+  else
+    comment='Install tinc to continue.' exit
+  fi
+fi
+
+trap - EXIT