From 39aa2bd743570be555935d6d95cb48fa08bbc6e3 Mon Sep 17 00:00:00 2001
From: ckamte <xworthsmith@gmail.com>
Date: Fri, 9 Jan 2026 17:07:08 +0630
Subject: [PATCH] Fixes for issues #22,, #24

---
 ccdl-win.py                  |  2 +-
 suite_installer/gen-suite.py | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ccdl-win.py b/ccdl-win.py
index 07580cd..56a2f77 100644
--- a/ccdl-win.py
+++ b/ccdl-win.py
@@ -148,7 +148,7 @@ def get_winver() -> str:
 def set_url_version(args: argparse.Namespace) -> str:
     """Set url version for downloading ffc.xml"""
     urlVersion = None
-    acceptVers = ["v4", "v4", "v6", "4", "5", "6"]
+    acceptVers = ["v4", "v5", "v6", "4", "5", "6"]
 
     if args.urlVersion:
         if args.urlVersion.lower() in acceptVers:
diff --git a/suite_installer/gen-suite.py b/suite_installer/gen-suite.py
index e8e0455..cefa44f 100644
--- a/suite_installer/gen-suite.py
+++ b/suite_installer/gen-suite.py
@@ -163,11 +163,25 @@ if __name__ == "__main__":
     parser.add_argument(
         "-d", "--prodsDir", help="Products directory", action="store"
     )
+    parser.add_argument(
+        "-n", "--suiteName", help="Name for suite", action="store"
+    )
+    parser.add_argument(
+        "-v", "--suiteVer", help="Suite version number", action="store"
+    )
     args = parser.parse_args()
 
     show_info(SCRIPT_NAME, VERSION_STR, 10, "=")
-    suiteName = (input("\nPlease enter a name for suite: ").strip() or "Adobe Creative Cloud")
-    suiteVer = (input("\nPlease enter suite version: ").strip() or "1.0")
+
+    suiteName = args.suiteName
+
+    while suiteName is None:
+        suiteName = (input("\nPlease enter a name for suite: ").strip() or "Adobe Creative Cloud")
+    
+    suiteVer = args.suiteVer
+    while suiteVer is None:
+        suiteVer = (input("\nPlease enter suite version: ").strip() or "1.0")
+    
     prodsDir = args.prodsDir or prodsDir
     print(f"\nSuiteInfo.xml file will be save in {os.path.realpath(prodsDir)}")