Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for signing variables before even trying to sign

Browse Source 
Also tabs to spaces and fix typo.
This commit is contained in:
Inusaito Sayori
2014-11-20 13:40:05 -05:00
parent 8b658bd628
commit 10a3339019
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
indra/newview/viewer_manifest.py
View File

@@ -336,7 +336,7 @@ class WindowsManifest(ViewerManifest):
self.path(path_pair[1]) self.path(path_pair[1])
self.end_prefix() self.end_prefix()
self.package_file = 'npne' self.package_file = 'none'
def nsi_file_commands(self, install=True): def nsi_file_commands(self, install=True):
@@ -454,12 +454,13 @@ class WindowsManifest(ViewerManifest):
substitution_strings['installer_file'] = installer_file substitution_strings['installer_file'] = installer_file
# Sign the binaries # Sign the binaries
try: if 'VIEWER_SIGNING_PASSWORD' in os.environ:
self.sign(self.args['configuration']+"\\"+self.final_exe()) try:
self.sign(self.args['configuration']+"\\SLPlugin.exe") self.sign(self.args['configuration']+"\\"+self.final_exe())
self.sign(self.args['configuration']+"\\SLVoice.exe") self.sign(self.args['configuration']+"\\SLPlugin.exe")
except Exception, e: self.sign(self.args['configuration']+"\\SLVoice.exe")
print "Couldn't sign binaries. Tried to sign %s" % self.args['configuration'] + "\\" + self.final_exe() + "\nException: %s" % e except Exception, e:
print "Couldn't sign binaries. Tried to sign %s" % self.args['configuration'] + "\\" + self.final_exe() + "\nException: %s" % e
tempfile = "secondlife_setup_tmp.nsi" tempfile = "secondlife_setup_tmp.nsi"
# the following replaces strings in the nsi template # the following replaces strings in the nsi template
# it also does python-style % substitution # it also does python-style % substitution
@@ -489,10 +490,11 @@ class WindowsManifest(ViewerManifest):
# self.remove(self.dst_path_of(tempfile)) # self.remove(self.dst_path_of(tempfile))
# Sign the installer # Sign the installer
try: if 'VIEWER_SIGNING_PASSWORD' in os.environ:
self.sign(self.args['configuration'] + "\\" + substitution_strings['installer_file']) try:
except Exception, e: self.sign(self.args['configuration'] + "\\" + substitution_strings['installer_file'])
print "Couldn't sign windows installer. Tried to sign %s" % self.args['configuration'] + "\\" + substitution_strings['installer_file'] + "\nException: %s" % e except Exception, e:
print "Couldn't sign windows installer. Tried to sign %s" % self.args['configuration'] + "\\" + substitution_strings['installer_file'] + "\nException: %s" % e
self.created_path(self.dst_path_of(installer_file)) self.created_path(self.dst_path_of(installer_file))
self.package_file = installer_file self.package_file = installer_file
@@ -640,9 +642,8 @@ class DarwinManifest(ViewerManifest):
pass pass
else: else:
home_path = os.environ['HOME'] home_path = os.environ['HOME']
self.run_command('security unlock-keychain -p "%s" "%s/Library/Keychains/viewer.keychain"' %
(signing_password, self.run_command('security unlock-keychain -p "%s" "%s/Library/Keychains/viewer.keychain"' % (signing_password, home_path))
home_path))
signed=False signed=False
sign_attempts=3 sign_attempts=3
sign_retry_wait=15 sign_retry_wait=15