From 78e21b520085eed4a7d8e4106d178d3319064546 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 21 Jul 2011 10:59:03 +0200 Subject: [PATCH] mass update commit Signed-off-by: Nico Schottelius --- eth/user/isg_sans_lab_install | 2 +- eth/user/isg_win7_install | 7 ++++--- figlet_alle_fonts | 3 ++- hole_mails | 2 +- kill | Bin 7988 -> 0 bytes lh | 8 ++++++-- linux/install.sh | 2 +- mytime | 3 +++ release_tmp | 2 +- x-autostart | 2 +- x-links | 2 +- x20x-sync | 9 ++++++++- 12 files changed, 29 insertions(+), 13 deletions(-) delete mode 100755 kill diff --git a/eth/user/isg_sans_lab_install b/eth/user/isg_sans_lab_install index 4020d37..e7291af 100755 --- a/eth/user/isg_sans_lab_install +++ b/eth/user/isg_sans_lab_install @@ -83,7 +83,7 @@ Name: Nico Schottelius NumScreens: 1 OU: Sans-lab Office: cab/e/79 -Other Info: Wie alle anderen sans-lab Maschinen +Other Info: Wie alle anderen sans-lab Maschinen, Siehe #112231, #112228, #111140 Phone: 27609 Resolution: 1920x1200 Root: ISG diff --git a/eth/user/isg_win7_install b/eth/user/isg_win7_install index 44b75d9..b4fe80a 100755 --- a/eth/user/isg_win7_install +++ b/eth/user/isg_win7_install @@ -34,9 +34,9 @@ if [ -z "$NETHZ_USERNAME" ]; then exit 1 fi -if [ $# -ne 3 ]; then +if [ $# -lt 3 ]; then cat << eof -$__myname: +$__myname: [comments] Requires NETHZ_USERNAME to be set. @@ -49,6 +49,7 @@ fi machine="$1"; shift ou="$1"; shift room="$1"; shift +comment="$@" headerto="support@inf.ethz.ch" to="support@inf.ethz.ch $from" @@ -75,7 +76,7 @@ Name: Nico Schottelius NumScreens: 1 OU: $ou Office: cab/e/79 -Other Info: +Other Info: $comment Phone: 27609 Resolution: 1920x1200 Root: ISG diff --git a/figlet_alle_fonts b/figlet_alle_fonts index 9a96ef0..9c6dcde 100755 --- a/figlet_alle_fonts +++ b/figlet_alle_fonts @@ -8,4 +8,5 @@ set -e cd /usr/share/figlet cd /usr/share/figlet/fonts/ #for a in *.flf; do BLA=${a%.flf}; echo $BLA; echo hallo | figlet -f $BLA; done -for a in *.flf; do BLA=${a%.flf}; echo $BLA; echo CM Bofs | figlet -f $BLA; done +#for a in *.flf; do BLA=${a%.flf}; echo $BLA; echo CM Bofs | figlet -f $BLA; done +for a in *.flf; do BLA=${a%.flf}; echo $BLA ; echo $BLA | figlet -f $BLA; done diff --git a/hole_mails b/hole_mails index 9f192eb..1ea2170 100755 --- a/hole_mails +++ b/hole_mails @@ -9,7 +9,7 @@ fi while true; do fetchmail >/dev/null -# offlineimap + offlineimap echo "Mails abgeholt, schlafe nun $SLEEP Sekunde(n)" sleep $SLEEP; done diff --git a/kill b/kill deleted file mode 100755 index 7b97a5b54569a7836039c4aabdae20132ed515b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7988 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 wjKyEVyjAHhgYcSilLhhgmz)iXT0q0)W4*&oF diff --git a/lh b/lh index 42c6b73..a19b816 100755 --- a/lh +++ b/lh @@ -1,5 +1,9 @@ #!/bin/sh -file=$(date +%Y-%m-%d) + +suffix="$1" +datef="$2" + +file=$(date +%Y-%m-%d $datef) set -x -$EDITOR "$1${file}" +$EDITOR "${file}${suffix}" diff --git a/linux/install.sh b/linux/install.sh index 0d07f3c..7cba1de 100755 --- a/linux/install.sh +++ b/linux/install.sh @@ -22,7 +22,7 @@ set -e #version="$(git describe) version=$(cat include/config/kernel.release) ddir="/boot" -spath="arch/x86_64/boot/bzImage" +spath="arch/x86/boot/bzImage" fname="vmlinuz-$version" fpath="${ddir}/${fname}" gpath="$ddir/grub/menu.lst" diff --git a/mytime b/mytime index 64b5d4a..a201994 100755 --- a/mytime +++ b/mytime @@ -7,3 +7,6 @@ LENGTH=$((END-START)) LENGTHM=$((LENGTH/60)) echo "Run: ${LENGTH}s ($LENGTHM minutes)" + +# Record values +echo "$@; ${LENGTH}" >> ~/.mytime diff --git a/release_tmp b/release_tmp index 548b8ca..32a5317 100755 --- a/release_tmp +++ b/release_tmp @@ -10,6 +10,6 @@ url="http://home.schottelius.org/~nico/temp" bfile="$(basename "$file")" scp "$file" "${host}:$dir" -ssh $host "chmod a+r $dir/$bfile" +ssh $host "chmod a+r \"$dir/$bfile\"" echo "Pre-released ${url}/${bfile}" diff --git a/x-autostart b/x-autostart index 2c3dddb..c91a711 100755 --- a/x-autostart +++ b/x-autostart @@ -5,7 +5,7 @@ tmutt tmutt # start tee window -x-terminal-emulator -name tee -e ressh.sh tee.schottelius.org +# x-terminal-emulator -name tee -e ressh.sh tee.schottelius.org # start root window x-terminal-emulator -name sudo -e sudo -i diff --git a/x-links b/x-links index b3babc4..2428df3 100755 --- a/x-links +++ b/x-links @@ -1,2 +1,2 @@ #!/bin/sh -xrandr --output HDMI1 --auto --rotate normal --right-of LVDS1 +xrandr --output HDMI1 --auto --rotate normal --left-of LVDS1 diff --git a/x20x-sync b/x20x-sync index b088876..8484c4e 100755 --- a/x20x-sync +++ b/x20x-sync @@ -10,6 +10,13 @@ case $(hostname) in ikn) other="root@kr.ethz.ch" ;; + *) + echo "I am confused, where I am?" + exit 1 + ;; esac -sudo rsync -av --delete-before --delete $dir $other:$dir +sudo rsync -av \ + --exclude /home/services/eth-usbhd \ + --exclude /home/services/usbhd \ + --delete-before --delete $dir $other:$dir