From 77eb9f5270bc79a312be95c65cfbe7a56e2952aa Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@ikn.schottelius.org>
Date: Mon, 28 Dec 2009 20:13:41 +0100
Subject: [PATCH] commit pending changes

Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
---
 eth/ikn-backup.sh         | 7 ++++++-
 eth/wlan-vpn.sh           | 2 +-
 logeth.sh                 | 4 ++--
 nz.sh                     | 3 ++-
 old/monitor-xrandr-aus.sh | 4 +++-
 welcome_greeting          | 3 +++
 x-monitors.sh             | 2 ++
 7 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/eth/ikn-backup.sh b/eth/ikn-backup.sh
index 411c575..3c16d7f 100755
--- a/eth/ikn-backup.sh
+++ b/eth/ikn-backup.sh
@@ -1,6 +1,11 @@
 #!/bin/sh -e
 
 
+if [ -z "$USBHD" -o $# -ne 1 ]; then
+   echo USBHD + interval
+   exit 1
+fi
+
 ccollect=/home/users/nico/lp/ccollect/ccollect/ccollect.sh
 
 # in pre_exec
@@ -8,7 +13,7 @@ ccollect=/home/users/nico/lp/ccollect/ccollect/ccollect.sh
 #mount /home/services/usbhd 
 
 #cd /home/user/nico/p/ccollect/ccollect
-CCOLLECT_CONF=/home/users/nico/ethz/ccollect $ccollect wöchentlich ikn
+CCOLLECT_CONF=/home/users/nico/ethz/ccollect $ccollect "$1" ikn
 
 # in post_exec
 #umount /home/services/usbhd 
diff --git a/eth/wlan-vpn.sh b/eth/wlan-vpn.sh
index 11cbe4d..08ba6a5 100755
--- a/eth/wlan-vpn.sh
+++ b/eth/wlan-vpn.sh
@@ -22,7 +22,7 @@ ip l s eth0 down
 wpa_supplicant -B -Dwext -iwlan0 -c ~nico/ethz/wlan/wpa_supplicant.conf
 sleep 5
 udhcpc -nqfi wlan0
-vpnc ~nico/ethz/vpn/pc.conf
+vpnc ~nico/ethz/vpn/sg.conf
 
 #vpnc ~nico/firmen/ethz/vpn/vpnc.conf
 # vpnc-disconnect
diff --git a/logeth.sh b/logeth.sh
index 4b8bc55..a1cb629 100755
--- a/logeth.sh
+++ b/logeth.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
-ddir="${HOME}/privat/firmen/ethz/logs"
+ddir="${HOME}/privat/firmen/ethz/vcs/logs/$(date +%Y)"
 file=$(date +%Y-%m-%d)
 dfile="${ddir}/${file}"
 
-vi "${dfile}"
+$EDITOR "${dfile}"
diff --git a/nz.sh b/nz.sh
index 9b3a64d..78787bb 100755
--- a/nz.sh
+++ b/nz.sh
@@ -3,4 +3,5 @@ ddir="${HOME}/privat/persoenlich/notizen"
 file=$(date +%Y-%m-%d)
 dfile="${ddir}/${file}"
 
-vi "${dfile}"
+set -x
+$EDITOR "${dfile}"
diff --git a/old/monitor-xrandr-aus.sh b/old/monitor-xrandr-aus.sh
index 61d7371..b15da85 100755
--- a/old/monitor-xrandr-aus.sh
+++ b/old/monitor-xrandr-aus.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
-external="HDMI-2 VGA"
+# Nico Schottelius
+
+external="$(cat ~/.x-monitors)"
 
 for R in $external; do
    xrandr --output $R --off
diff --git a/welcome_greeting b/welcome_greeting
index 8a20849..391c2e6 100755
--- a/welcome_greeting
+++ b/welcome_greeting
@@ -22,3 +22,6 @@ MY_ECHO="echo"
 #$MY_ECHO $BOLD$RED
 cat ~/.loginart
 #$MY_ECHO $END
+
+echo ""
+cat ~/.ziele
diff --git a/x-monitors.sh b/x-monitors.sh
index 93ba297..aa56fd0 100755
--- a/x-monitors.sh
+++ b/x-monitors.sh
@@ -34,6 +34,8 @@ prefix=".x-monitors-"
 
 i=0
 
+xrandr --output "${main}" --auto
+
 # Needs to run twice: xrandr may not be able to
 # enable a newly connected monitor, because a disconnected one
 # is still enabled. The first runs disables disconnected monitors, the