@@ -659,8 +659,8 @@ def main(override=None, intel_for_uc=None, force_uc=None):
659659 else :
660660 not_latest = c5 + "(" + c4 + "Legacy Version" + c5 + ")" + cr
661661 p_version = p_version + " " + not_latest
662- msg = c2 + "chromedriver to download " + cr
663- log_d ("\n *** %s = %s" % (msg , p_version ))
662+ msg = c2 + "chromedriver" + cr
663+ log_d ("\n *** Getting %s %s" % (msg , p_version ))
664664 else :
665665 raise Exception ("Could not find chromedriver to download!\n " )
666666 if not get_latest :
@@ -704,9 +704,9 @@ def main(override=None, intel_for_uc=None, force_uc=None):
704704 use_version = found_version
705705 if not use_version :
706706 use_version = get_cft_latest_version_from_milestone (major_version )
707- msg = c2 + "Chrome for Testing to download " + cr
707+ msg = c2 + "Chrome for Testing" + cr
708708 p_version = c3 + use_version + cr
709- log_d ("\n *** %s = %s" % (msg , p_version ))
709+ log_d ("\n *** Getting %s %s" % (msg , p_version ))
710710 if IS_MAC :
711711 if IS_ARM_MAC :
712712 platform_code = "mac-arm64"
@@ -813,9 +813,9 @@ def main(override=None, intel_for_uc=None, force_uc=None):
813813 use_version = found_version
814814 if not use_version :
815815 use_version = get_cft_latest_version_from_milestone (major_version )
816- msg = c2 + "Chrome-Headless-Shell to download " + cr
816+ msg = c2 + "Chrome-Headless-Shell" + cr
817817 p_version = c3 + use_version + cr
818- log_d ("\n *** %s = %s" % (msg , p_version ))
818+ log_d ("\n *** Getting %s %s" % (msg , p_version ))
819819 if IS_MAC :
820820 if IS_ARM_MAC :
821821 platform_code = "mac-arm64"
@@ -892,9 +892,9 @@ def main(override=None, intel_for_uc=None, force_uc=None):
892892 if not found_geckodriver :
893893 url_request = requests_get (download_url )
894894 if found_geckodriver or url_request .ok :
895- msg = c2 + "geckodriver to download " + cr
895+ msg = c2 + "geckodriver" + cr
896896 p_version = c3 + use_version + cr
897- log_d ("\n *** %s = %s" % (msg , p_version ))
897+ log_d ("\n *** Getting %s %s" % (msg , p_version ))
898898 else :
899899 raise Exception (
900900 "\n Could not find the specified geckodriver "
@@ -999,9 +999,9 @@ def main(override=None, intel_for_uc=None, force_uc=None):
999999 raise Exception (
10001000 "Could not find version [%s] of EdgeDriver!" % use_version
10011001 )
1002- msg = c2 + "edgedriver to download " + cr
1002+ msg = c2 + "edgedriver" + cr
10031003 p_version = c3 + use_version + cr
1004- log_d ("\n *** %s = %s" % (msg , p_version ))
1004+ log_d ("\n *** Getting %s %s" % (msg , p_version ))
10051005 elif name == "iedriver" :
10061006 full_version = "4.14.0"
10071007 use_version = full_version
@@ -1029,9 +1029,9 @@ def main(override=None, intel_for_uc=None, force_uc=None):
10291029 url_request = requests_get_with_retry (headless_ie_url )
10301030 if url_request .ok :
10311031 headless_ie_exists = True
1032- msg = c2 + "HeadlessIEDriver to download " + cr
1032+ msg = c2 + "HeadlessIEDriver" + cr
10331033 p_version = c3 + headless_ie_version + cr
1034- log_d ("\n *** %s = %s" % (msg , p_version ))
1034+ log_d ("\n *** Getting %s %s" % (msg , p_version ))
10351035 else :
10361036 invalid_run_command ()
10371037
@@ -1095,7 +1095,7 @@ def main(override=None, intel_for_uc=None, force_uc=None):
10951095 os .remove (new_file )
10961096 if not driver_file or not driver_path or not filename :
10971097 raise Exception ("headless_ie_selenium.exe missing from Zip file!" )
1098- log_d ("Extracting %s from %s ... " % (filename , headless_ie_file_name ))
1098+ log_d ("Extracting %s from %s: " % (filename , headless_ie_file_name ))
10991099 zip_ref .extractall (downloads_folder )
11001100 zip_ref .close ()
11011101 os .remove (zip_file_path )
@@ -1120,13 +1120,12 @@ def main(override=None, intel_for_uc=None, force_uc=None):
11201120 os .rmdir (os .path .join (downloads_folder , h_ie_fn ))
11211121 driver_path = os .path .join (downloads_folder , filename )
11221122 log_d (
1123- "The file [%s ] was saved to:\n %s%s%s\n "
1123+ "['%s' ] was saved to:\n %s%s%s\n "
11241124 % (filename , c3 , driver_path , cr )
11251125 )
1126- log_d ("Making [%s %s] executable ..." % (driver_file , use_version ))
11271126 make_executable (driver_path )
11281127 log_d (
1129- "%s[%s %s] is now ready for use!%s"
1128+ "%s[%s %s] is ready for use!%s"
11301129 % (c1 , driver_file , use_version , cr )
11311130 )
11321131
@@ -1180,7 +1179,7 @@ def main(override=None, intel_for_uc=None, force_uc=None):
11801179 os .remove (new_file ) # Technically the old file now
11811180 if driver_contents :
11821181 contents = driver_contents
1183- log_d ("Extracting %s from %s ... " % (contents , file_name ))
1182+ log_d ("Extracting %s from %s: " % (contents , file_name ))
11841183 if name == "uc_driver" :
11851184 f_name = "uc_driver"
11861185 new_file = os .path .join (downloads_folder , f_name )
@@ -1232,11 +1231,10 @@ def main(override=None, intel_for_uc=None, force_uc=None):
12321231 d_folder = os .sep .join (pr_file .split (os .sep )[:- 1 ]) + os .sep
12331232 d_file = pr_file .split (os .sep )[- 1 ]
12341233 d_ff = c3 + d_folder + cr + "\n " + c3 + d_file + cr
1235- log_d ("The file [%s] was saved to:\n %s\n " % (f_name , d_ff ))
1236- log_d ("Making [%s %s] executable ..." % (f_name , use_version ))
1234+ log_d ("['%s'] was saved to:\n %s\n " % (f_name , d_ff ))
12371235 make_executable (new_file )
12381236 log_d (
1239- "%s[%s %s] is now ready for use!%s" %
1237+ "%s[%s %s] is ready for use!%s" %
12401238 (c1 , f_name , use_version , cr )
12411239 )
12421240 if copy_to_path and os .path .exists (LOCAL_PATH ):
@@ -1301,7 +1299,7 @@ def main(override=None, intel_for_uc=None, force_uc=None):
13011299 if str_name == "IEDriverServer.exe" :
13021300 raise Exception ("IEDriverServer missing from Zip file!" )
13031301 raise Exception ("msedgedriver missing from Zip file!" )
1304- log_d ("Extracting %s from %s ... " % (contents , file_name ))
1302+ log_d ("Extracting %s from %s: " % (contents , file_name ))
13051303 zip_ref .extractall (downloads_folder )
13061304 zip_ref .close ()
13071305 os .remove (zip_file_path )
@@ -1323,13 +1321,12 @@ def main(override=None, intel_for_uc=None, force_uc=None):
13231321 pr_sep = c3 + os .sep + cr
13241322 pr_driver_file = c3 + driver_file + cr
13251323 log_d (
1326- "The file [%s ] was saved to:\n %s%s\n %s\n "
1324+ "['%s' ] was saved to:\n %s%s\n %s\n "
13271325 % (driver_file , pr_driver_base , pr_sep , pr_driver_file )
13281326 )
1329- log_d ("Making [%s %s] executable ..." % (driver_file , use_version ))
13301327 make_executable (driver_path )
13311328 log_d (
1332- "%s[%s %s] is now ready for use!%s"
1329+ "%s[%s %s] is ready for use!%s"
13331330 % (c1 , driver_file , use_version , cr )
13341331 )
13351332 if copy_to_path and os .path .exists (LOCAL_PATH ):
@@ -1462,7 +1459,7 @@ def main(override=None, intel_for_uc=None, force_uc=None):
14621459 if "Driver" in new_file or "driver" in new_file :
14631460 if os .path .exists (new_file ):
14641461 os .remove (new_file ) # Technically the old file now
1465- log_d ("Extracting %s from %s ... " % (contents , file_name ))
1462+ log_d ("Extracting %s from %s: " % (contents , file_name ))
14661463 if sys .version_info < (3 , 12 ):
14671464 tar .extractall (downloads_folder )
14681465 else :
@@ -1473,11 +1470,10 @@ def main(override=None, intel_for_uc=None, force_uc=None):
14731470 for f_name in contents :
14741471 new_file = os .path .join (downloads_folder , str (f_name ))
14751472 pr_file = c3 + new_file + cr
1476- log_d ("The file [%s] was saved to:\n %s\n " % (f_name , pr_file ))
1477- log_d ("Making [%s %s] executable ..." % (f_name , use_version ))
1473+ log_d ("['%s'] was saved to:\n %s\n " % (f_name , pr_file ))
14781474 make_executable (new_file )
14791475 log_d (
1480- "%s[%s %s] is now ready for use!%s"
1476+ "%s[%s %s] is ready for use!%s"
14811477 % (c1 , f_name , use_version , cr )
14821478 )
14831479 if copy_to_path and os .path .exists (LOCAL_PATH ):
@@ -1494,9 +1490,8 @@ def main(override=None, intel_for_uc=None, force_uc=None):
14941490 # Not a .zip file or a .tar.gz file. Just a direct download.
14951491 if "Driver" in file_name or "driver" in file_name :
14961492 log_d ("%sDownload Complete!%s\n " % (c1 , cr ))
1497- log_d ("Making [%s] executable ..." % file_name )
14981493 make_executable (file_path )
1499- log_d ("%s[%s] is now ready for use!%s" % (c1 , file_name , cr ))
1494+ log_d ("%s[%s] is ready for use!%s" % (c1 , file_name , cr ))
15001495 log_d ("Location of [%s]:\n %s\n " % (file_name , file_path ))
15011496
15021497
0 commit comments