X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=ud-replicate;h=a9e294bbf80492baa9df4fb1305f5c8ac1729e99;hb=a599d46c4f33a68d1033bba48060089749ec5e0d;hp=d1c0b24ca2519d7af07087cc69df3b59c8f8a398;hpb=88a19a6e47a1c577474311d016ae5d26a72a4029;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-replicate b/ud-replicate
index d1c0b24..a9e294b 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -4,7 +4,7 @@
 #   Copyright (c) 2002-2003,2006  Ryan Murray <rmurray@debian.org>
 #   Copyright (c) 2004-2005  Joey Schulze <joey@infodrom.org>
 #   Copyright (c) 2008 Peter Palfrader <peter@palfrader.org>
-#   Copyright (©) 2008 Stephen Gran <sgran@debian.org>
+#   Copyright (c) 2008 Stephen Gran <sgran@debian.org>
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -78,21 +78,19 @@ ln -sf `pwd -P`/ssh-rsa-shadow /etc/ssh
 ln -sf `pwd -P`/ssh_known_hosts /etc/ssh
 
 if [ -e ${HOST}/ssh-keys.tar.gz ]; then
-  export TMPDIR='/tmp/' 
+  export TMPDIR='/tmp/'
   tempdir=$(mktemp -d)
-  old=$(pwd -P)
-  cd $tempdir && tar -xf ${old}/${HOST}/ssh-keys.tar.gz
-  cd $old
-  mkdir userkeys 2> /dev/null || true
+  tar -C "$tempdir" -xf ${HOST}/ssh-keys.tar.gz
+  mkdir -p userkeys
   chmod 755 $tempdir
   rsync -a --delete-after $tempdir/ userkeys/
 fi
 
+CHROOTS=""
 if [ -x /usr/bin/dchroot ]; then
 	CHROOTS=`dchroot --listpaths`
-fi
-if [ -x /usr/bin/dchroot-dsa ]; then
-        CHROOTS=$(dchroot-dsa -i | grep Location | awk '{print $2}')
+elif [ -x /usr/bin/dchroot-dsa ]; then
+	CHROOTS=$(dchroot-dsa -i | grep Location | awk '{print $2}')
 fi
 if [ -n "$CHROOTS" ]; then
 	for c in $CHROOTS; do