Merge branch 'release/1.1.8'

resources/tools/util_scripts/edit_launch_txt.py

@@ -1,12 +1,11 @@
 import json
 import os
 import urllib
-from global_paths import App as AppPaths
 
 class Edit_launch_txt:
 	def execute(self):
 		try:
-			with open(os.path.join(AppPaths.wcm_work_dir, 'pkg.json')) as f:
+			with open('../util_generated_files/params.json') as f:
 				json_data = json.load(f)
 
 			# web_command = '/play.ps3'
@@ -17,15 +16,16 @@ def execute(self):
 			web_command_string = pre_cmd + str(json_data['iso_filepath'] + post_cmd)
 			web_url_string = 'GET ' + urllib.quote(web_command_string) + ' HTTP/1.0'
 
-			launch_txt = open(os.path.join(AppPaths.USRDIR, 'launch.txt'), 'wb')
+			launch_txt = open("../../pkg/USRDIR/launch.txt", "wb")
 			launch_txt_byteArray = bytearray(web_command_string) + os.linesep
 			launch_txt.write(launch_txt_byteArray)
-
-			url_txt = open(os.path.join(AppPaths.USRDIR, 'url.txt'), 'wb')
+
+			# manual build of the url.txt
+			url_txt = open("../../pkg/USRDIR/url.txt", "wb")
 			url_txt_byteArray = bytearray(web_url_string) + os.linesep
 			url_txt.write(url_txt_byteArray)
-
-			print('Execution of \'edit_launch_txt.py\':         Done')
+			
+			print('Execution of \'edit_launch_txt.py\':        Done')
 			print('-----------------------------------------------')
-		except Exception as e:
+		except Exception, e:
 			print('Error: ' + str(e))