From 3680beca30ed94bb8a18f502c91c7fa297ae1819 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sun, 11 Mar 2012 13:17:37 +0000
Subject: [PATCH] Moved the upload scripts to a proper command

---
 config.sample.py       |  3 +++
 fdroid                 |  3 ++-
 fdroidserver/server.py | 50 ++++++++++++++++++++++++++++++++++++++++++
 upload.sh              |  3 ---
 uploadquick.sh         |  3 ---
 5 files changed, 55 insertions(+), 7 deletions(-)
 create mode 100644 fdroidserver/server.py
 delete mode 100755 upload.sh
 delete mode 100755 uploadquick.sh

diff --git a/config.sample.py b/config.sample.py
index bdfc022d..6053c895 100644
--- a/config.sample.py
+++ b/config.sample.py
@@ -39,4 +39,7 @@ keydname = "CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=California, C=US"
 keyaliases = {}
 keyaliases['com.example.app'] = 'example'
 
+#The ssh path to the server's public web root directory. This is used for
+#uploading data, etc.
+serverwebroot = 'user@example:/var/www/repo'
 
diff --git a/fdroid b/fdroid
index e6ef5930..22bcffac 100755
--- a/fdroid
+++ b/fdroid
@@ -28,7 +28,8 @@ commands = [
         "import",
         "rewritemeta",
         "scanner",
-        "stats"]
+        "stats",
+        "server"]
 
 def main():
 
diff --git a/fdroidserver/server.py b/fdroidserver/server.py
new file mode 100644
index 00000000..1d67a4e8
--- /dev/null
+++ b/fdroidserver/server.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# server.py - part of the FDroid server tools
+# Copyright (C) 2010-12, Ciaran Gultnieks, ciaran@ciarang.com
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import sys
+import os
+import subprocess
+from optparse import OptionParser
+
+def main():
+
+    #Read configuration...
+    execfile('config.py', globals())
+
+    # Parse command line...
+    parser = OptionParser()
+    parser.add_option("-v", "--verbose", action="store_true", default=False,
+                      help="Spew out even more information than normal")
+    (options, args) = parser.parse_args()
+
+    if len(args) != 1:
+        print "Specify a single command"
+        sys.exit(1)
+
+    if args[0] != 'update':
+        print "The only command currently supported is 'update'"
+        sys.exit(1)
+
+    sys.exit(subprocess.call(['rsync', 
+        '-u', '-v', '-r', '--delete', 'repo', serverwebroot]))
+
+if __name__ == "__main__":
+    main()
+
+
diff --git a/upload.sh b/upload.sh
deleted file mode 100755
index 2c75d1e2..00000000
--- a/upload.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-rsync -v -r --delete repo fdroid@f-droid.org:/home/fdroid/public_html
-
diff --git a/uploadquick.sh b/uploadquick.sh
deleted file mode 100755
index 19845818..00000000
--- a/uploadquick.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-rsync -u -v -r --delete repo fdroid@f-droid.org:/home/fdroid/public_html
-