livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correct icon and app name recognition by channel

Oz Linden 2013-02-28 13:45:49 -05:00
parent f3f495330c
commit 65e4ea3e28
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/viewer_manifest.py
View File

@ -176,18 +176,19 @@ class ViewerManifest(LLManifest):
channel_type=self.channel_lowerword()
if channel_type == 'release' :
app_suffix='Viewer'
elif re.match('(beta|project) .*',channel_type) :
elif re.match('^(beta|project).*',channel_type) :
app_suffix=self.channel_unique()
return "Second Life "+app_suffix
def icon_path(self):
icon_path="icons/"
channel_type=self.channel_lowerword()
print "Icon channel type '%s'" % channel_type
if channel_type == 'release' :
icon_path += channel_type
elif re.match('beta .*',channel_type) :
elif re.match('^beta.*',channel_type) :
icon_path += 'beta'
elif re.match('project .*',channel_type) :
elif re.match('^project.*',channel_type) :
icon_path += 'project'
else :
icon_path += 'test'
@ -245,7 +246,7 @@ class WindowsManifest(ViewerManifest):
channel_type=self.channel_lowerword()
if channel_type == 'release' :
app_suffix=''
elif re.match('(beta|project) .*',channel_type) :
elif re.match('^(beta|project).*',channel_type) :
app_suffix=''.join(self.channel_unique().split())
return "SecondLife"+app_suffix+".exe"