@@ -14,9 +14,9 @@ def check_system():
14
14
operating system of the user.
15
15
"""
16
16
if sys .platform .startswith ('darwin' ): # OSX
17
- return "/ Contents/MacOS/LP_XMLConverter.app/Contents/MacOS/LP_XMLConverter"
17
+ return "Contents/MacOS/LP_XMLConverter.app/Contents/MacOS/LP_XMLConverter"
18
18
elif sys .platform .startswith ('win' ): # Windows
19
- return "/ LP_XMLConverter.exe"
19
+ return "LP_XMLConverter.exe"
20
20
else :
21
21
sublime .error_message ("GDL build error: Your OS is not supported." )
22
22
return
@@ -138,7 +138,7 @@ def show_quick_panel(self, options, done):
138
138
sublime .set_timeout (lambda : self .window .show_quick_panel (options , done ), 10 )
139
139
140
140
def run_hsf (self , ):
141
- converter = self .AC_path + self .os
141
+ converter = os . path . join ( self .AC_path , self .os )
142
142
cmd = [converter , "libpart2hsf" , self .cmdargs , self .file_to_convert , self .project_folder ] # cmd, source, dest
143
143
cmd = list (filter (None , cmd )) # filters out the empty cmdargs. otherwise Macs get hiccups. sigh.
144
144
log .debug ("GDL Command run: " + " " .join (cmd ))
@@ -199,35 +199,30 @@ def select_project(self, select):
199
199
self .on_done_proj () # go on here
200
200
201
201
def find_hsf (self ):
202
- # self.folders = []
203
- #for fldr in os.listdir(self.project_folder):
204
- # for fldr in os.scandir(self.project_folder):
205
- # self.folders.append(fldr.name)
206
202
self .folders = [fldr for fldr in os .listdir (self .project_folder ) if os .path .isdir (os .path .join (self .project_folder , fldr ))]
207
- print (self .folders )
208
203
209
204
if len (self .folders ) <= 0 :
210
205
sublime .error_message ("GDL build error: No HSF found." )
211
206
212
207
if len (self .folders ) > 1 :
213
208
self .show_quick_panel (self .folders , self .select_hsf )
214
209
else :
215
- self .folder_to_convert = self .project_folder + " \\ " + self .folders [0 ]
210
+ self .folder_to_convert = os . path . join ( self .project_folder , self .folders [0 ])
216
211
self .on_done_file () # go on here
217
212
218
213
def select_hsf (self , select ):
219
214
folders = self .folders
220
215
if select < 0 : # will be -1 if panel was cancelled
221
216
return
222
- self .folder_to_convert = self .project_folder + " \\ " + folders [select ]
217
+ self .folder_to_convert = os . path . join ( self .project_folder , folders [select ])
223
218
self .on_done_file () # go on here
224
219
225
220
# Sublime Text 3 requires a short timeout between quick panels
226
221
def show_quick_panel (self , options , done ):
227
222
sublime .set_timeout (lambda : self .window .show_quick_panel (options , done ), 10 )
228
223
229
224
def run_libpart (self ):
230
- converter = self .AC_path + self .os
225
+ converter = os . path . join ( self .AC_path , self .os )
231
226
cmd = [converter , "hsf2libpart" , self .cmdargs , self .folder_to_convert , self .gsm_name ] # cmd, source, dest
232
227
cmd = list (filter (None , cmd )) # filters out the empty cmdargs. otherwise Macs get hiccups. sigh.
233
228
log .debug ("GDL Command run: " + " " .join (cmd ))
0 commit comments