Change macOS app name to colcon_terminal_notifier (#72)

Co-authored-by: Scott K Logan <[email protected]>
colcon · Mar 12, 2024 · 9fd966f · 9fd966f
1 parent 41a1f09
commit 9fd966f
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 41 deletions.
diff --git 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/...terminal-notifier.app/Contents/Info.plist → ...terminal_notifier.app/Contents/Info.plist b/...terminal-notifier.app/Contents/Info.plist → ...terminal_notifier.app/Contents/Info.plist
@@ -7,15 +7,15 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
-	<string>colcon-terminal-notifier</string>
+	<string>colcon_terminal_notifier</string>
 	<key>CFBundleIconFile</key>
 	<string>colcon</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.github.colcon.terminal-notifier</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>colcon-terminal-notifier</string>
+	<string>colcon_terminal_notifier</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>

diff --git a/...p/Contents/MacOS/colcon-terminal-notifier → ...p/Contents/MacOS/colcon_terminal_notifier b/...p/Contents/MacOS/colcon-terminal-notifier → ...p/Contents/MacOS/colcon_terminal_notifier
diff --git a/...on-terminal-notifier.app/Contents/PkgInfo → ...on_terminal_notifier.app/Contents/PkgInfo b/...on-terminal-notifier.app/Contents/PkgInfo → ...on_terminal_notifier.app/Contents/PkgInfo
diff --git a/...tifier.app/Contents/Resources/colcon.icns → ...tifier.app/Contents/Resources/colcon.icns b/...tifier.app/Contents/Resources/colcon.icns → ...tifier.app/Contents/Resources/colcon.icns
diff --git a/...p/Contents/Resources/en.lproj/Credits.rtf → ...p/Contents/Resources/en.lproj/Credits.rtf b/...p/Contents/Resources/en.lproj/Credits.rtf → ...p/Contents/Resources/en.lproj/Credits.rtf
diff --git a/...ents/Resources/en.lproj/InfoPlist.strings → ...ents/Resources/en.lproj/InfoPlist.strings b/...ents/Resources/en.lproj/InfoPlist.strings → ...ents/Resources/en.lproj/InfoPlist.strings
diff --git a/.../Contents/Resources/en.lproj/MainMenu.nib → .../Contents/Resources/en.lproj/MainMenu.nib b/.../Contents/Resources/en.lproj/MainMenu.nib → .../Contents/Resources/en.lproj/MainMenu.nib
diff --git 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 <[email protected]>
 
 --- setup.cfg	2019-06-04 20:00:00.000000000 -0800
@@ -9,30 +9,30 @@ Author: Dirk Thomas <[email protected]>
  	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
@@ -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 =