Merge pull request #2771 from benkwokcy/fix/local-mac-build

Fix macOS local build crash when PYFA_VERSION is unset

Author: DarkFenX

.gitignore

@@ -128,5 +128,8 @@ gitversion
 *.fsdbinary
 /locale/progress.json
 
+# Generated by db_update.py
+eve.db
+
 # vscode settings
 .vscode

dist_assets/mac/pyfa.spec

@@ -11,6 +11,10 @@ label = subprocess.check_output([
 with open('.version', 'w+') as f:
     f.write(label.decode())
 
+# Use PYFA_VERSION from the environment (set in CI), falling back to the
+# git-describe label so local builds don't crash on a None plist value.
+pyfa_version = os.getenv('PYFA_VERSION') or label.decode()
+
 block_cipher = None
 
 added_files = [
@@ -88,7 +92,7 @@ coll = COLLECT(
 app = BUNDLE(
     coll,
     name='pyfa.app',
-    version=os.getenv('PYFA_VERSION'),
+    version=pyfa_version,
     icon=icon,
     bundle_identifier=None,
     info_plist={
@@ -97,7 +101,7 @@ app = BUNDLE(
         'CFBundleName': 'pyfa',
         'CFBundleDisplayName': 'pyfa',
         'CFBundleIdentifier': 'org.pyfaorg.pyfa',
-        'CFBundleVersion': os.getenv('PYFA_VERSION'),
-        'CFBundleShortVersionString': os.getenv('PYFA_VERSION'),
+        'CFBundleVersion': pyfa_version,
+        'CFBundleShortVersionString': pyfa_version,
     }
 )