postinst-setup: some fixes

diff --git a/postinst-setup b/postinst-setup
index 25b174759541ad750a007c27c76b64c943222c7e..a64e7569426b03f5eaa03aad112d6fc44d8b6ce7 100755 (executable)
--- a/postinst-setup
+++ b/postinst-setup
@@ -3,6 +3,7 @@
 # move backup to /var
 if [ -d /home/martin/backup ] && [ ! -d /var/backups/martin ]; then
     cp -a /home/martin/backup /var/backups/martin
+    rm -rf /home/martin/backup
 fi
 
 # install already shipped debs
@@ -22,11 +23,13 @@ fi
 # completely
 cd /etc
 if [ ! -d /etc/.bzr ]; then
-    rsync -r martin@piware.de:backup/desktop-etc/.bzr .
     for i in passwd group shadow fstab; do
         cp $i $i.originst
     done
-    bzr revert --no-backup
+    bzr get bzr+ssh://martin@piware.de/home/martin/backup/desktop-etc /desktop-etc
+    cp -av /desktop-etc/* /etc/
+    cp -av /desktop-etc/.bzr/ /etc/
+    rm -rf /desktop-etc
 fi
 
 # only restore dchroot part into fstab