Move command-line processing to dedicated function

1 files changed, 41 insertions, 34 deletions

diff --git a/scripts/uploadrelease.py b/scripts/uploadrelease.py
index bf69dda6..04e13ed9 100755
--- a/scripts/uploadrelease.py
+++ b/scripts/uploadrelease.py
@@ -102,40 +102,11 @@ def sourceforge_target_dir(version):
     return directory
 
 
-def upload_release_files():
-    ''' Upload release files from source directory to SourceForge
-    '''
-    version = get_release_version()
-    target = sf_files + sourceforge_target_dir(version)
-
-    print
-    print "Uploading release files..."
-    print "  Source:", release_path
-    print "  Target: " + target
-    print
-    call_rsync(
-        username,
-        "--exclude=docs",
-        path.join(release_path, "*"),
-        target
-    )
-
-
-def upload_documentation():
-    ''' Upload documentation to Sourceforge web site
+def process_command_line():
+    ''' Retrieve command-line options and set global variables accordingly
     '''
-    print
-    print "Uploading documentation..."
-    print
-    call_rsync(
-        username,
-        "",
-        path.join(release_path, "docs", "*"),
-        sf_doc
-    )
-
+    global upload_files, upload_doc, dry_run, username, release_path
 
-def main():
     # Get command-line options
     try:
         opts, args = getopt.gnu_getopt(sys.argv[1:], options, long_options)
@@ -149,8 +120,7 @@ def main():
         print "ERROR: please specify the Sourceforge user and release_path"
         sys.exit(1)
 
-    global upload_files, upload_doc, dry_run, username, release_path
-
+    # Default values for flags
     upload_files = True
     upload_doc = True
     dry_run = False
@@ -179,6 +149,43 @@ def main():
     except IndexError:
         release_path = os.getcwd()
 
+
+def upload_release_files():
+    ''' Upload release files from source directory to SourceForge
+    '''
+    version = get_release_version()
+    target = sf_files + sourceforge_target_dir(version)
+
+    print
+    print "Uploading release files..."
+    print "  Source:", release_path
+    print "  Target: " + target
+    print
+    call_rsync(
+        username,
+        "--exclude=docs",
+        path.join(release_path, "*"),
+        target
+    )
+
+
+def upload_documentation():
+    ''' Upload documentation to Sourceforge web site
+    '''
+    print
+    print "Uploading documentation..."
+    print
+    call_rsync(
+        username,
+        "",
+        path.join(release_path, "docs", "*"),
+        sf_doc
+    )
+
+
+def main():
+    process_command_line()
+
     # Start upload process
     print "ADOdb release upload script"