From 9fd966fe96ca2148a78a0604b163d5cec35edcd5 Mon Sep 17 00:00:00 2001 From: "Matt Ryall [Mawson Rovers]" <95326985+mryall-mawson@users.noreply.github.com> Date: Wed, 13 Mar 2024 06:20:40 +1100 Subject: [PATCH] Change macOS app name to colcon_terminal_notifier (#72) Co-authored-by: Scott K Logan --- .../desktop_notification/terminal_notifier.py | 8 +-- .../Contents/Info.plist | 4 +- .../Contents/MacOS/colcon_terminal_notifier | Bin .../Contents/PkgInfo | 0 .../Contents/Resources/colcon.icns | Bin .../Contents/Resources/en.lproj/Credits.rtf | 0 .../Resources/en.lproj/InfoPlist.strings | Bin .../Contents/Resources/en.lproj/MainMenu.nib | Bin debian/patches/setup.cfg.patch | 48 +++++++++--------- setup.cfg | 22 ++++---- 10 files changed, 41 insertions(+), 41 deletions(-) rename {colcon-terminal-notifier.app => colcon_terminal_notifier.app}/Contents/Info.plist (95%) rename colcon-terminal-notifier.app/Contents/MacOS/colcon-terminal-notifier => colcon_terminal_notifier.app/Contents/MacOS/colcon_terminal_notifier (100%) rename {colcon-terminal-notifier.app => colcon_terminal_notifier.app}/Contents/PkgInfo (100%) rename {colcon-terminal-notifier.app => colcon_terminal_notifier.app}/Contents/Resources/colcon.icns (100%) rename {colcon-terminal-notifier.app => colcon_terminal_notifier.app}/Contents/Resources/en.lproj/Credits.rtf (100%) rename {colcon-terminal-notifier.app => colcon_terminal_notifier.app}/Contents/Resources/en.lproj/InfoPlist.strings (100%) rename {colcon-terminal-notifier.app => colcon_terminal_notifier.app}/Contents/Resources/en.lproj/MainMenu.nib (100%) diff --git a/colcon_notification/desktop_notification/terminal_notifier.py b/colcon_notification/desktop_notification/terminal_notifier.py index 513516d..fe0bf23 100644 --- a/colcon_notification/desktop_notification/terminal_notifier.py +++ b/colcon_notification/desktop_notification/terminal_notifier.py @@ -18,7 +18,7 @@ class TerminalNotifierDesktopNotification(DesktopNotificationExtensionPoint): - """Use `colcon-terminal-notifier` to show notifications.""" + """Use `colcon_terminal_notifier` to show notifications.""" def __init__(self): # noqa: D107 super().__init__() @@ -50,13 +50,13 @@ def notify(self, *, title, message, icon_path=None): # noqa: D102 if install_prefix is None: logger.error( 'Could not determine the install prefix of the ' - 'colcon-terminal-notifier.app') + 'colcon_terminal_notifier.app') return app_path = _get_app_path(install_prefix) if app_path is None: logger.error( - 'Could not find the colcon-terminal-notifier.app in the ' + 'Could not find the colcon_terminal_notifier.app in the ' "install prefix '{install_prefix}'".format_map(locals())) return @@ -74,7 +74,7 @@ def notify(self, *, title, message, icon_path=None): # noqa: D102 subprocess.run(cmd, input=message.encode()) except FileNotFoundError: logger.error( - "Failed to find 'colcon-terminal-notifier'") + "Failed to find 'colcon_terminal_notifier'") except subprocess.CalledProcessError: cmd_str = ' '.join(cmd) logger.error( diff --git a/colcon-terminal-notifier.app/Contents/Info.plist b/colcon_terminal_notifier.app/Contents/Info.plist similarity index 95% rename from colcon-terminal-notifier.app/Contents/Info.plist rename to colcon_terminal_notifier.app/Contents/Info.plist index f7f9e6b..c2db921 100644 --- a/colcon-terminal-notifier.app/Contents/Info.plist +++ b/colcon_terminal_notifier.app/Contents/Info.plist @@ -7,7 +7,7 @@ CFBundleDevelopmentRegion en CFBundleExecutable - colcon-terminal-notifier + colcon_terminal_notifier CFBundleIconFile colcon CFBundleIdentifier @@ -15,7 +15,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - colcon-terminal-notifier + colcon_terminal_notifier CFBundlePackageType APPL CFBundleShortVersionString diff --git a/colcon-terminal-notifier.app/Contents/MacOS/colcon-terminal-notifier b/colcon_terminal_notifier.app/Contents/MacOS/colcon_terminal_notifier similarity index 100% rename from colcon-terminal-notifier.app/Contents/MacOS/colcon-terminal-notifier rename to colcon_terminal_notifier.app/Contents/MacOS/colcon_terminal_notifier diff --git a/colcon-terminal-notifier.app/Contents/PkgInfo b/colcon_terminal_notifier.app/Contents/PkgInfo similarity index 100% rename from colcon-terminal-notifier.app/Contents/PkgInfo rename to colcon_terminal_notifier.app/Contents/PkgInfo diff --git a/colcon-terminal-notifier.app/Contents/Resources/colcon.icns b/colcon_terminal_notifier.app/Contents/Resources/colcon.icns similarity index 100% rename from colcon-terminal-notifier.app/Contents/Resources/colcon.icns rename to colcon_terminal_notifier.app/Contents/Resources/colcon.icns diff --git a/colcon-terminal-notifier.app/Contents/Resources/en.lproj/Credits.rtf b/colcon_terminal_notifier.app/Contents/Resources/en.lproj/Credits.rtf similarity index 100% rename from colcon-terminal-notifier.app/Contents/Resources/en.lproj/Credits.rtf rename to colcon_terminal_notifier.app/Contents/Resources/en.lproj/Credits.rtf diff --git a/colcon-terminal-notifier.app/Contents/Resources/en.lproj/InfoPlist.strings b/colcon_terminal_notifier.app/Contents/Resources/en.lproj/InfoPlist.strings similarity index 100% rename from colcon-terminal-notifier.app/Contents/Resources/en.lproj/InfoPlist.strings rename to colcon_terminal_notifier.app/Contents/Resources/en.lproj/InfoPlist.strings diff --git a/colcon-terminal-notifier.app/Contents/Resources/en.lproj/MainMenu.nib b/colcon_terminal_notifier.app/Contents/Resources/en.lproj/MainMenu.nib similarity index 100% rename from colcon-terminal-notifier.app/Contents/Resources/en.lproj/MainMenu.nib rename to colcon_terminal_notifier.app/Contents/Resources/en.lproj/MainMenu.nib diff --git a/debian/patches/setup.cfg.patch b/debian/patches/setup.cfg.patch index 349b0c4..3d7f0be 100644 --- a/debian/patches/setup.cfg.patch +++ b/debian/patches/setup.cfg.patch @@ -1,5 +1,5 @@ Description: Remove the data_files from the setup.cfg file since the - Debian package doesn't need the colcon-terminal-notifier.app. + Debian package doesn't need the colcon_terminal_notifier.app. Author: Dirk Thomas --- setup.cfg 2019-06-04 20:00:00.000000000 -0800 @@ -9,30 +9,30 @@ Author: Dirk Thomas scspell3k>=2.2 -[options.data_files] --share/colcon_notification/colcon-terminal-notifier.app/Contents = -- colcon-terminal-notifier.app/Contents/Info.plist -- colcon-terminal-notifier.app/Contents/PkgInfo --share/colcon_notification/colcon-terminal-notifier.app/Contents/MacOS = -- colcon-terminal-notifier.app/Contents/MacOS/colcon-terminal-notifier --share/colcon_notification/colcon-terminal-notifier.app/Contents/Resources = -- colcon-terminal-notifier.app/Contents/Resources/colcon.icns --share/colcon_notification/colcon-terminal-notifier.app/Contents/Resources/en.lproj = -- colcon-terminal-notifier.app/Contents/Resources/en.lproj/Credits.rtf -- colcon-terminal-notifier.app/Contents/Resources/en.lproj/InfoPlist.strings -- colcon-terminal-notifier.app/Contents/Resources/en.lproj/MainMenu.nib -+# the Debian package doesn't need the colcon-terminal-notifier.app +-share/colcon_notification/colcon_terminal_notifier.app/Contents = +- colcon_terminal_notifier.app/Contents/Info.plist +- colcon_terminal_notifier.app/Contents/PkgInfo +-share/colcon_notification/colcon_terminal_notifier.app/Contents/MacOS = +- colcon_terminal_notifier.app/Contents/MacOS/colcon_terminal_notifier +-share/colcon_notification/colcon_terminal_notifier.app/Contents/Resources = +- colcon_terminal_notifier.app/Contents/Resources/colcon.icns +-share/colcon_notification/colcon_terminal_notifier.app/Contents/Resources/en.lproj = +- colcon_terminal_notifier.app/Contents/Resources/en.lproj/Credits.rtf +- colcon_terminal_notifier.app/Contents/Resources/en.lproj/InfoPlist.strings +- colcon_terminal_notifier.app/Contents/Resources/en.lproj/MainMenu.nib ++# the Debian package doesn't need the colcon_terminal_notifier.app +# [options.data_files] -+# share/colcon_notification/colcon-terminal-notifier.app/Contents = -+# colcon-terminal-notifier.app/Contents/Info.plist -+# colcon-terminal-notifier.app/Contents/PkgInfo -+# share/colcon_notification/colcon-terminal-notifier.app/Contents/MacOS = -+# colcon-terminal-notifier.app/Contents/MacOS/colcon-terminal-notifier -+# share/colcon_notification/colcon-terminal-notifier.app/Contents/Resources = -+# colcon-terminal-notifier.app/Contents/Resources/colcon.icns -+# share/colcon_notification/colcon-terminal-notifier.app/Contents/Resources/en.lproj = -+# colcon-terminal-notifier.app/Contents/Resources/en.lproj/Credits.rtf -+# colcon-terminal-notifier.app/Contents/Resources/en.lproj/InfoPlist.strings -+# colcon-terminal-notifier.app/Contents/Resources/en.lproj/MainMenu.nib ++# share/colcon_notification/colcon_terminal_notifier.app/Contents = ++# colcon_terminal_notifier.app/Contents/Info.plist ++# colcon_terminal_notifier.app/Contents/PkgInfo ++# share/colcon_notification/colcon_terminal_notifier.app/Contents/MacOS = ++# colcon_terminal_notifier.app/Contents/MacOS/colcon_terminal_notifier ++# share/colcon_notification/colcon_terminal_notifier.app/Contents/Resources = ++# colcon_terminal_notifier.app/Contents/Resources/colcon.icns ++# share/colcon_notification/colcon_terminal_notifier.app/Contents/Resources/en.lproj = ++# colcon_terminal_notifier.app/Contents/Resources/en.lproj/Credits.rtf ++# colcon_terminal_notifier.app/Contents/Resources/en.lproj/InfoPlist.strings ++# colcon_terminal_notifier.app/Contents/Resources/en.lproj/MainMenu.nib [tool:pytest] filterwarnings = diff --git a/setup.cfg b/setup.cfg index f281021..03c9138 100644 --- a/setup.cfg +++ b/setup.cfg @@ -52,17 +52,17 @@ test = [options.data_files] # distutils replaces dashes in keys with underscores -share/colcon_notification/colcon-terminal-notifier.app/Contents = - colcon-terminal-notifier.app/Contents/Info.plist - colcon-terminal-notifier.app/Contents/PkgInfo -share/colcon_notification/colcon-terminal-notifier.app/Contents/MacOS = - colcon-terminal-notifier.app/Contents/MacOS/colcon-terminal-notifier -share/colcon_notification/colcon-terminal-notifier.app/Contents/Resources = - colcon-terminal-notifier.app/Contents/Resources/colcon.icns -share/colcon_notification/colcon-terminal-notifier.app/Contents/Resources/en.lproj = - colcon-terminal-notifier.app/Contents/Resources/en.lproj/Credits.rtf - colcon-terminal-notifier.app/Contents/Resources/en.lproj/InfoPlist.strings - colcon-terminal-notifier.app/Contents/Resources/en.lproj/MainMenu.nib +share/colcon_notification/colcon_terminal_notifier.app/Contents = + colcon_terminal_notifier.app/Contents/Info.plist + colcon_terminal_notifier.app/Contents/PkgInfo +share/colcon_notification/colcon_terminal_notifier.app/Contents/MacOS = + colcon_terminal_notifier.app/Contents/MacOS/colcon_terminal_notifier +share/colcon_notification/colcon_terminal_notifier.app/Contents/Resources = + colcon_terminal_notifier.app/Contents/Resources/colcon.icns +share/colcon_notification/colcon_terminal_notifier.app/Contents/Resources/en.lproj = + colcon_terminal_notifier.app/Contents/Resources/en.lproj/Credits.rtf + colcon_terminal_notifier.app/Contents/Resources/en.lproj/InfoPlist.strings + colcon_terminal_notifier.app/Contents/Resources/en.lproj/MainMenu.nib [tool:pytest] filterwarnings =