From c69f844bae1f3fe7fe7d8e4c6fed750a32b55ee6 Mon Sep 17 00:00:00 2001 From: jjoyce Date: Thu, 7 May 2015 15:03:02 -0400 Subject: [PATCH] Python PEP8 cleanup of macosx_makebundle.py --- scripts/build/macosx_makebundle.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/build/macosx_makebundle.py b/scripts/build/macosx_makebundle.py index fe1ba87c..f3b86da4 100755 --- a/scripts/build/macosx_makebundle.py +++ b/scripts/build/macosx_makebundle.py @@ -27,7 +27,7 @@ if len(sys.argv) < 2: SOURCE_DIR = sys.argv[1] if len(sys.argv) < 4: - BUNDLE_NAME= "Quassel Client" + BUNDLE_NAME = "Quassel Client" EXE_NAME = "quasselclient" else: EXE_NAME = sys.argv[3] @@ -38,9 +38,10 @@ if(os.path.dirname(EXE_NAME)): CONTENTS_DIR = os.path.dirname(EXE_NAME) + "/" CONTENTS_DIR += BUNDLE_NAME + ".app/Contents/" -BUNDLE_VERSION = commands.getoutput("git --git-dir="+SOURCE_DIR+"/.git/ describe") +BUNDLE_VERSION = commands.getoutput("git --git-dir=" + SOURCE_DIR + "/.git/ describe") ICON_FILE = "pics/quassel.icns" + def createBundle(): try: os.makedirs(CONTENTS_DIR + "MacOS") @@ -48,23 +49,24 @@ def createBundle(): except: pass + def copyFiles(exeFile, iconFile): os.system("cp %s %sMacOs/%s" % (exeFile, CONTENTS_DIR.replace(' ', '\ '), BUNDLE_NAME.replace(' ', '\ '))) os.system("cp %s/%s %s/Resources" % (SOURCE_DIR, iconFile, CONTENTS_DIR.replace(' ', '\ '))) + def createPlist(bundleName, iconFile, bundleVersion): templateFile = file(SOURCE_DIR + "/scripts/build/Info.plist", 'r') template = templateFile.read() templateFile.close() plistFile = file(CONTENTS_DIR + "Info.plist", 'w') - plistFile.write(template % {"BUNDLE_NAME" : bundleName, - "ICON_FILE" : iconFile[iconFile.rfind("/")+1:], - "BUNDLE_VERSION" : bundleVersion}) + plistFile.write(template % {"BUNDLE_NAME": bundleName, + "ICON_FILE": iconFile[iconFile.rfind("/") + 1:], + "BUNDLE_VERSION": bundleVersion}) plistFile.close() if __name__ == "__main__": createBundle() createPlist(BUNDLE_NAME, ICON_FILE, BUNDLE_VERSION) copyFiles(EXE_NAME, ICON_FILE) - pass -- 2.20.1