summaryrefslogtreecommitdiffstats
path: root/mining/user
diff options
context:
space:
mode:
authormakefu <makefu@syntax-fehler.de>2011-06-23 01:11:50 +0200
committermakefu <makefu@syntax-fehler.de>2011-06-23 01:11:50 +0200
commit99bf20b83c5161866e96df918ab1a98a841c4e88 (patch)
tree162bb4350e15552b449c118e426dd11f0fcd056a /mining/user
parentaf2705c70a245b3f281f7a64039b6d50976fb982 (diff)
parent9ab87e479e1f75665bc69623eeb740758acb3f0a (diff)
merged Makefile, install lmsensors AND tmux
Diffstat (limited to 'mining/user')
-rwxr-xr-xmining/user/bin/ati_temper5
-rw-r--r--mining/user/mining.ovdr (renamed from mining/user/mining.odvr)0
-rw-r--r--mining/user/startup.sh2
3 files changed, 6 insertions, 1 deletions
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