diff --git a/.gitignore b/.gitignore
index 4b7b5f5..d32954d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ CmdBar
CmdBar.app
cmdbar_updater
src/updater
+ids
diff --git a/Makefile b/Makefile
index 15376af..be38e3e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,17 @@
+APPLE_ID := $(shell cat ./ids/APPLE_ID)
+TEAM_ID := $(shell cat ./ids/TEAM_ID)
+APP_SPECIFIC_PASSWORD := $(shell cat ./ids/APP_SPECIFIC_PASSWORD)
+
CmdBar.app:
- $(MAKE) -C src FLAGS=-O CFLAGS=-O3 all
+ $(MAKE) -C src FLAGS=-O CFLAGS=-O3 default
container:
ditto -c -k --keepParent ./src/CmdBar.app ./build/CmdBar.zip
notarize:
xcrun notarytool submit ./build/CmdBar.zip \
- --keychain-profile "notarytool-password" --wait
+ --apple-id "$(APPLE_ID)" --team-id "$(TEAM_ID)" \
+ --password "$(APP_SPECIFIC_PASSWORD)" --wait
staple:
cd build && \
@@ -27,6 +32,9 @@ dmg:
all: CmdBar.app container notarize staple zip dmg
+status:
+ @echo 'xcrun notarytool log "" --apple-id "$(APPLE_ID)" --team-id "$(TEAM_ID)" --password "$(APP_SPECIFIC_PASSWORD)" developer_log.json'
+
clean:
rm -rf build
diff --git a/src/AboutViewController.swift b/src/AboutViewController.swift
index 2f568dd..8b7de48 100644
--- a/src/AboutViewController.swift
+++ b/src/AboutViewController.swift
@@ -2,20 +2,13 @@ import AppKit
// MARK: - Constants
fileprivate enum AboutLinks {
- static let website = "https://cmdbar.app"
- static let documentation = "https://cmdbar.app/documentation"
- static let privacy = "https://cmdbar.app/#privacy-policy"
+ static let website = "https://cmdbar.rednera.com"
+ static let documentation = "https://cmdbar.rednera.com/documentation"
+ static let privacy = "https://cmdbar.rednera.com/#privacy-policy"
}
enum Strings {
- static let copyright = "Copyright © 2024\nGarikMI. All rights reserved."
- static let evaluationTitle = "License - Evaluation"
- static let evaluationMessage = "You are currently using evaluation license. CmdBar will quit after 20 minutes. If you already own a license, enter it below or purchase a license."
- static let activate = "Activate"
- static let proTitle = "License - Activated"
- static let proMessage = "Thank you for purchasing CmdBar! Enjoy!"
- static let deactivate = "Deactivate"
- static let activating = "Activating..."
+ static let copyright = "Copyright © 2026 Rednera.\nAll rights reserved."
}
// MARK: - Controller
@@ -105,7 +98,7 @@ class AboutViewController: NSViewController, NSTextFieldDelegate {
private var websiteButton: NSButton = {
let button = NSButton()
- button.title = "CmdBar.app"
+ button.title = "CmdBar"
button.sizeToFit()
button.bezelStyle = .rounded
button.action = #selector(website)
diff --git a/src/Info.plist b/src/Info.plist
index 2f26272..684be60 100644
--- a/src/Info.plist
+++ b/src/Info.plist
@@ -11,7 +11,7 @@
CFBundleIconName
AppIcon
CFBundleIdentifier
- com.garikme.CmdBar
+ com.rednera.CmdBar
CFBundleInfoDictionaryVersion
6.0
CFBundleName
@@ -19,13 +19,13 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 1.93
+ 1.94.0
CFBundleSupportedPlatforms
MacOSX
CFBundleVersion
- 1.93
+ 1.94.0
DTPlatformName
macosx
DTPlatformVersion
@@ -40,5 +40,7 @@
NSPrincipalClass
NSApplication
+ NSHumanReadableCopyright
+ Copyright © 2026 Rednera. All rights reserved.
diff --git a/src/Makefile b/src/Makefile
index a65c847..0b45213 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,3 +1,6 @@
+APPLE_DEVELOPMENT := $(shell cat ../ids/APPLE_DEVELOPMENT)
+APPLE_DEVELOPER_ID_APPLICATION := $(shell cat ../ids/APPLE_DEVELOPER_ID_APPLICATION)
+
# FLAGS = -g
FLAGS = -O
MACOS_VERSION = 13.0
@@ -75,15 +78,11 @@ $(EXEC).app: $(EXEC)
cp Info.plist $@/Contents/ && \
cp resources/AppIcon.icns $@/Contents/Resources/ && \
cp $(EXEC) $@/Contents/MacOS/
- # $(if $(DEBUG), codesign --entitlements Grapp.entitlements \
- # -s ${APPLE_DEVELOPMENT} -f --timestamp -o runtime $(EXEC).app, \
- # codesign -s ${APPLE_DEVELOPER_ID_APPLICATION} -f --timestamp \
- # -o runtime $(EXEC).app)
+ $(if $(DEBUG), codesign --entitlements $(EXEC).entitlements \
+ -s ${APPLE_DEVELOPMENT} -f --timestamp -o runtime $(EXEC).app, \
+ codesign -s ${APPLE_DEVELOPER_ID_APPLICATION} -f --timestamp \
+ -o runtime $(EXEC).app)
clean:
rm -rf $(EXEC) $(EXEC).app arm64 x86_64
mkdir -p arm64 x86_64
-
-clean-all: clean
- $(MAKE) -C libs/Zip/Zip/minizip clean
- $(MAKE) -C libs/Zip/Zip clean