style: consistent naming of secret/envvar

Dhruv7201 · Jan 5, 2022 · 4b493b8 · 4b493b8
1 parent 7da56c4
commit 4b493b8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -146,8 +146,8 @@ jobs:
       env:
         APPLE_EMAIL: ${{ secrets.APPLE_EMAIL }}
         APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-        APPLE_PERSONAL_ID: ${{ secrets.APPLE_TEAMID }} # APPLE_PERSONAL_ID == APPLE_TEAM_ID for personal accounts
-        APPLE_TEAM_ID: ${{ secrets.APPLE_TEAMID }}
+        APPLE_PERSONALID: ${{ secrets.APPLE_TEAMID }} # APPLE_PERSONAL_ID == APPLE_TEAM_ID for personal accounts
+        APPLE_TEAMID: ${{ secrets.APPLE_TEAMID }}
 
     - name: Upload packages
       uses: actions/upload-artifact@v2-preview

diff --git a/Makefile b/Makefile
@@ -138,7 +138,7 @@ dist/ActivityWatch.app: aw-qt/media/logo/logo.icns
 dist/ActivityWatch.dmg: dist/ActivityWatch.app
 	pip install dmgbuild
 	dmgbuild -s scripts/package/dmgbuild-settings.py -D app=dist/ActivityWatch.app "ActivityWatch" dist/ActivityWatch.dmg
-	codesign --verbose -s ${APPLE_PERSONAL_ID} dist/ActivityWatch.dmg
+	codesign --verbose -s ${APPLE_PERSONALID} dist/ActivityWatch.dmg
 
 dist/notarize:
 	./scripts/notarize.sh

diff --git a/aw.spec b/aw.spec
@@ -18,8 +18,8 @@ current_release = subprocess.run(
 print("bundling activitywatch version " + current_release)
 
 entitlements_file = Path(".") / "scripts" / "package" / "entitlements.plist"
-codesign_identity = os.environ.get("APPLE_PERSONAL_ID")
-assert codesign_identity, "Environment variable APPLE_PERSONAL_ID not set"
+codesign_identity = os.environ.get("APPLE_PERSONALID")
+assert codesign_identity, "Environment variable APPLE_PERSONALID not set"
 
 aw_core_path = Path(os.path.dirname(aw_core.__file__))
 restx_path = Path(os.path.dirname(flask_restx.__file__))

diff --git a/scripts/notarize.sh b/scripts/notarize.sh
@@ -2,8 +2,8 @@
 
 applemail=$APPLE_EMAIL # Email address used for Apple ID
 password=$APPLE_PASSWORD # See apps-specific password https://support.apple.com/en-us/HT204397
-teamid=$APPLE_TEAM_ID # Team idenitifer (if single developer, then set to developer identifier)
-keychain_profile="activitywatch-$APPLE_PERSONAL_ID"  # name of the keychain profile to use
+teamid=$APPLE_TEAMID # Team idenitifer (if single developer, then set to developer identifier)
+keychain_profile="activitywatch-$APPLE_PERSONALID"  # name of the keychain profile to use
 bundleid=net.activitywatch.ActivityWatch # Match aw.spec
 app=dist/ActivityWatch.app
 dmg=dist/ActivityWatch.dmg