From 12237bd4762086a14b526771c5fc67752b22d7eb Mon Sep 17 00:00:00 2001
From: Chinaman <root@chinaman>
Date: Fri, 8 Jul 2011 18:02:29 +0200
Subject: mining/bin/archlinux-cruise-control added

script is pulled out from the original Makefile.
added TODO file(because every project needs one
---
 mining/Makefile                     | 38 +-------------------------------
 mining/TODO                         |  2 ++
 mining/bin/archlinux-cruise-control | 44 +++++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 37 deletions(-)
 create mode 100644 mining/TODO
 create mode 100755 mining/bin/archlinux-cruise-control

diff --git a/mining/Makefile b/mining/Makefile
index 21db5091..f8362cda 100644
--- a/mining/Makefile
+++ b/mining/Makefile
@@ -17,40 +17,4 @@ configure:
 	sensors-detect
 	@cat CONFIGURE
 archlinux:
-	@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
-	@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 
-
-	pacman --needed --noconfirm -Syu rsync git openssh yajl sudo tmux lm_sensors vim yaourt kernel26-headers 
-	@echo "** installing tinc"
-	yaourt -S 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 -f xorg-server xorg-apps xorg-appres xorg-xinit xautolock xlockmore xorg-fonts xorg-xhost xorg-xauth xterm rxvt-unicode xorg-twm
-	@echo "** copying bin folder"
-	cp -r bin /home/worker
-	@echo "** creating new .Xauthority for worker"
-	sudo -u worker /home/worker/bin/newkey.sh
-	@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 'xterm &' >> /home/worker/.xinitrc	
-	echo 'exec awesome' >> /home/worker/.xinitrc	
-	@echo '!! start x with `xinit -- -auth ~/.Xauthority`'
+	bin/archlinux-cruise-control
diff --git a/mining/TODO b/mining/TODO
new file mode 100644
index 00000000..bafaa72a
--- /dev/null
+++ b/mining/TODO
@@ -0,0 +1,2 @@
+- 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
new file mode 100755
index 00000000..d455d10e
--- /dev/null
+++ b/mining/bin/archlinux-cruise-control
@@ -0,0 +1,44 @@
+#!/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
+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 
+pacman --needed --noconfirm -Syu rsync git openssh yajl sudo tmux lm_sensors vim yaourt kernel26-headers 
+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 xorg-twm
+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
+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 'xterm &' >> /home/worker/.xinitrc	
+echo 'exec twm' >> /home/worker/.xinitrc	
+echo '!! start x with `xinit -- -auth ~/.Xauthority`'
+
-- 
cgit v1.2.3