Various minor fixes in the publish process

setup/file_hosting_servers.rst

@@ -35,3 +35,13 @@ rsync /srv from another file server
 
 service nginx start
 
+Services
+---------
+
+SSH into sourceforge and downloadbestsoftware so that their host keys are
+stored.
+
+   ssh -oStrictHostKeyChecking=no kovid@www.downloadbestsoft-mirror1.com
+   ssh -oStrictHostKeyChecking=no kovidgoyal,calibre@frs.sourceforge.net
+   ssh -oStrictHostKeyChecking=no files.calibre-ebook.com (and whatever other mirrors are present)
+

setup/hosting.py

@@ -473,14 +473,18 @@ def upload_to_servers(files, version):  # {{{
         os.mkdir(dest)
     for src in files:
         shutil.copyfile(src, os.path.join(dest, os.path.basename(src)))
-    generate_index()
+    cwd = os.getcwd()
+    try:
+        generate_index()
+    finally:
+        os.chdir(cwd)
 
     for server, rdir in {'files':'/srv/download/'}.iteritems():
         print('Uploading to server:', server)
         server = '%s.calibre-ebook.com' % server
         # Copy the generated index files
         print ('Copying generated index')
-        check_call(['rsync', '-hzr', '-e', 'ssh -x', '--include', '*.html',
+        check_call(['rsync', '-hza', '-e', 'ssh -x', '--include', '*.html',
                     '--filter', '-! */', base, 'root@%s:%s' % (server, rdir)])
         # Copy the release files
         rdir = '%s%s/' % (rdir, version)

setup/upload.py

@@ -255,8 +255,6 @@ class UploadToServer(Command):  # {{{
     description = 'Upload miscellaneous data to calibre server'
 
     def run(self, opts):
-        check_call('ssh divok rm -f %s/calibre-\*.tar.xz'%DOWNLOADS, shell=True)
-        # check_call('scp dist/calibre-*.tar.xz divok:%s/'%DOWNLOADS, shell=True)
         check_call('gpg --armor --detach-sign dist/calibre-*.tar.xz',
                 shell=True)
         check_call('scp dist/calibre-*.tar.xz.asc divok:%s/signatures/'%DOWNLOADS,