mirror of
https://github.com/ckamte/adobe-packager-windows.git
synced 2026-11-14 09:37:24 -05:00
Fixes for issues #22,, #24
This commit is contained in:
@@ -148,7 +148,7 @@ def get_winver() -> str:
|
|||||||
def set_url_version(args: argparse.Namespace) -> str:
|
def set_url_version(args: argparse.Namespace) -> str:
|
||||||
"""Set url version for downloading ffc.xml"""
|
"""Set url version for downloading ffc.xml"""
|
||||||
urlVersion = None
|
urlVersion = None
|
||||||
acceptVers = ["v4", "v4", "v6", "4", "5", "6"]
|
acceptVers = ["v4", "v5", "v6", "4", "5", "6"]
|
||||||
|
|
||||||
if args.urlVersion:
|
if args.urlVersion:
|
||||||
if args.urlVersion.lower() in acceptVers:
|
if args.urlVersion.lower() in acceptVers:
|
||||||
|
|||||||
@@ -163,11 +163,25 @@ if __name__ == "__main__":
|
|||||||
parser.add_argument(
|
parser.add_argument(
|
||||||
"-d", "--prodsDir", help="Products directory", action="store"
|
"-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()
|
args = parser.parse_args()
|
||||||
|
|
||||||
show_info(SCRIPT_NAME, VERSION_STR, 10, "=")
|
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
|
prodsDir = args.prodsDir or prodsDir
|
||||||
print(f"\nSuiteInfo.xml file will be save in {os.path.realpath(prodsDir)}")
|
print(f"\nSuiteInfo.xml file will be save in {os.path.realpath(prodsDir)}")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user