postinst-setup: use bzr sftp, not smartserver

[bin.git] / postinst-setup

diff --git a/postinst-setup b/postinst-setup
index 3b5c15187dd7481fa016b59b58fe4c66acbbf8e7..82d6aa3ab99482fca652ead79df0a36d21211515 100755 (executable)
--- a/postinst-setup
+++ b/postinst-setup
@@ -15,7 +15,7 @@ fi
 DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential fakeroot devscripts postfix openssh-server bzr
 
 # root's ssh stuff
-if [ ! -d /root/ssh ] && [ -d /home/martin/.ssh ]; then
+if [ ! -d /root/.ssh ] && [ -d /home/martin/.ssh ]; then
     mkdir -p /root/.ssh
     chmod 700 /root/.ssh
     cp /home/martin/.ssh/id_dsa* /home/martin/.ssh/known_hosts /home/martin/.ssh/config /root/.ssh/
@@ -26,9 +26,9 @@ fi
 cd /etc
 if [ ! -d /etc/.bzr ]; then
     for i in passwd group shadow fstab; do
-        cp $i $i.originst
+        [ -e $i.originst] || cp $i $i.originst
     done
-    bzr get bzr+ssh://martin@piware.de/home/martin/backup/`hostname`-etc /backup-etc
+    bzr get sftp://martin@piware.de/home/martin/backup/`hostname`-etc /backup-etc
     cp -av /backup-etc/* /etc/
     cp -av /backup-etc/.bzr/ /etc/
     rm -rf /backup-etc
@@ -36,7 +36,7 @@ if [ ! -d /etc/.bzr ]; then
 fi
 
 # only restore dchroot part into fstab
-grep -A 200 "^# dchroots" fstab >> fstab.originst
+grep -A 200 "^# dchroots" fstab >> fstab.originst || true
 mv fstab.originst fstab
 
 # only restore the human users from passwd/group
@@ -73,11 +73,11 @@ rm /etc/rcS.d/*pcmcia* /etc/rcS.d/*ppp*
 killall apt-get || true
 apt-get update -o Acquire::Http::No-Cache=true
 
-DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes vim bzrtools bzr-svn python-paramiko patchutils offlineimap wipe diffstat gtimelog jigdo-file libtool devhelp python-doc manpages-dev gstreamer0.10-plugins-ugly gstreamer0.10-plugins-bad gstreamer0.10-plugins-bad-multiverse gstreamer0.10-plugins-ugly-multiverse gstreamer0.10-ffmpeg weechat weechat-plugins weechat-scripts dpatch wdiff grep-dctrl ccache subversion listadmin quilt python-dev cryptsetup mutt editmoin lintian python-gtk2-doc fakechroot
+DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes vim bzrtools bzr-svn python-paramiko patchutils offlineimap wipe diffstat gtimelog jigdo-file libtool devhelp python-doc manpages-dev gstreamer0.10-plugins-ugly gstreamer0.10-plugins-bad gstreamer0.10-plugins-bad-multiverse gstreamer0.10-plugins-ugly-multiverse gstreamer0.10-ffmpeg weechat weechat-plugins weechat-scripts dpatch wdiff grep-dctrl ccache subversion listadmin quilt python-dev cryptsetup mutt editmoin lintian python-gtk2-doc fakechroot ubuntu-dev-tools dput gnome-blog
 apt-get -y build-dep postgresql-8.3 gnome-volume-manager hal cupsys apport jockey
 
 if [ `hostname` = donald ]; then
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes dchroot rsnapshot dhcp3-server apache2 ia32-libs easytag latex-beamer fakechroot
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes dchroot rsnapshot dhcp3-server apache2 ia32-libs easytag latex-beamer texlive-lang-german fakechroot
 fi
 
 umount /cdrom || true
@@ -93,7 +93,7 @@ if [ `hostname` = "donald" ]; then
 
     # crontabs
     crontab -u martin - <<EOF
-    # m h  dom mon dow   command
-    05 * * * * \$HOME/bin/backup >/dev/null
+# m h  dom mon dow   command
+05 * * * * \$HOME/bin/backup >/dev/null
 EOF
 fi