Skip to content

Commit da78d4a

Browse files
authored
update to consistent app name
1 parent e373548 commit da78d4a

7 files changed

Lines changed: 23 additions & 32 deletions

File tree

linux/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ project(runner LANGUAGES CXX)
44

55
# The name of the executable created for the application. Change this to change
66
# the on-disk name of your application.
7-
set(BINARY_NAME "echo")
7+
set(BINARY_NAME "echo-music")
88
# The unique GTK application identifier for this application. See:
99
# https://wiki.gnome.org/HowDoI/ChooseApplicationID
1010
set(APPLICATION_ID "com.echo.music")

linux/packaging/AppRun

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh
22
APPDIR="$(dirname "$(readlink -f "$0")")"
3-
exec "$APPDIR/usr/bin/echo" "$@"
3+
exec "$APPDIR/usr/bin/echo-music" "$@"

linux/packaging/build.sh

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ SKIP_FLUTTER_BUILD=false
2020

2121
# Version from pubspec.yaml
2222
VERSION=$(grep '^version:' pubspec.yaml | sed 's/version: *//;s/+.*//;s/ *$//')
23-
echo "Building Echo $VERSION"
23+
echo "Building Echo Music $VERSION"
2424

2525
BUNDLE="$REPO_ROOT/build/linux/x64/release/bundle"
2626
if [ "$SKIP_FLUTTER_BUILD" = true ]; then
@@ -41,7 +41,7 @@ rm -rf "$STAGING"
4141
mkdir -p "$STAGING/usr/bin/lib" "$STAGING/usr/bin/data"
4242

4343
# --- Staging: binary, libs, data (all under usr/bin so engine finds them) ---
44-
cp "$BUNDLE/echo" "$STAGING/usr/bin/echo"
44+
cp "$BUNDLE/echo-music" "$STAGING/usr/bin/echo-music"
4545
cp -a "$BUNDLE/lib/"* "$STAGING/usr/bin/lib/" 2>/dev/null || true
4646
cp -a "$BUNDLE/data/"* "$STAGING/usr/bin/data/"
4747

@@ -55,32 +55,31 @@ for lib in libmpv libmimalloc; do
5555
done
5656
done
5757

58-
patchelf --set-rpath '$ORIGIN/lib' "$STAGING/usr/bin/echo"
59-
chmod +x "$STAGING/usr/bin/echo"
58+
patchelf --set-rpath '$ORIGIN/lib' "$STAGING/usr/bin/echo-music"
59+
chmod +x "$STAGING/usr/bin/echo-music"
6060

61-
# .deb/.rpm: same layout, binary named echo-music to avoid conflict with coreutils
61+
# .deb/.rpm: same layout
6262
PKG_STAGING="$REPO_ROOT/build/linux_pkg_staging_named"
6363
rm -rf "$PKG_STAGING"
6464
mkdir -p "$PKG_STAGING/usr/bin/lib" "$PKG_STAGING/usr/bin/data" \
6565
"$PKG_STAGING/usr/share/applications" "$PKG_STAGING/usr/share/icons/hicolor/256x256/apps"
66-
cp "$STAGING/usr/bin/echo" "$PKG_STAGING/usr/bin/echo-music"
6766
cp -a "$STAGING/usr/bin/lib/"* "$PKG_STAGING/usr/bin/lib/"
6867
cp -a "$STAGING/usr/bin/data/"* "$PKG_STAGING/usr/bin/data/"
69-
cp "$REPO_ROOT/icons/Echo_nobg.png" "$PKG_STAGING/usr/share/icons/hicolor/256x256/apps/echo.png"
68+
cp "$REPO_ROOT/icons/Echo_nobg.png" "$PKG_STAGING/usr/share/icons/hicolor/256x256/apps/echo-music.png"
7069
cp "$REPO_ROOT/linux/packaging/echo-music.desktop" "$PKG_STAGING/usr/share/applications/echo-music.desktop"
7170
patchelf --set-rpath '$ORIGIN/lib' "$PKG_STAGING/usr/bin/echo-music"
7271
chmod +x "$PKG_STAGING/usr/bin/echo-music"
7372

7473
echo "Staging ready at $STAGING"
7574

7675
# --- AppImage ---
77-
APPDIR="$REPO_ROOT/build/Echo.AppDir"
76+
APPDIR="$REPO_ROOT/build/Echo-Music.AppDir"
7877
rm -rf "$APPDIR"
7978
mkdir -p "$APPDIR/usr" "$APPDIR/usr/share/icons/hicolor/256x256/apps"
8079
cp -a "$STAGING/usr/bin" "$APPDIR/usr/"
81-
cp "$REPO_ROOT/icons/Echo_nobg.png" "$APPDIR/usr/share/icons/hicolor/256x256/apps/echo.png"
82-
cp "$REPO_ROOT/icons/Echo_nobg.png" "$APPDIR/echo.png"
83-
cp "$REPO_ROOT/linux/packaging/echo.desktop" "$APPDIR/echo.desktop"
80+
cp "$REPO_ROOT/icons/Echo_nobg.png" "$APPDIR/usr/share/icons/hicolor/256x256/apps/echo-music.png"
81+
cp "$REPO_ROOT/icons/Echo_nobg.png" "$APPDIR/echo-music.png"
82+
cp "$REPO_ROOT/linux/packaging/echo-music.desktop" "$APPDIR/echo-music.desktop"
8483
cp "$REPO_ROOT/linux/packaging/AppRun" "$APPDIR/AppRun"
8584
chmod +x "$APPDIR/AppRun"
8685

@@ -96,16 +95,16 @@ else
9695
chmod +x "$REPO_ROOT/build/appimagetool.AppImage"
9796
APPIMAGETOOL="$REPO_ROOT/build/appimagetool.AppImage"
9897
fi
99-
ARCH=x86_64 "$APPIMAGETOOL" -n "$APPDIR" "$REPO_ROOT/build/Echo-${VERSION}-x86_64.AppImage"
100-
echo "Built: build/Echo-${VERSION}-x86_64.AppImage"
98+
ARCH=x86_64 "$APPIMAGETOOL" -n "$APPDIR" "$REPO_ROOT/build/Echo-Music-${VERSION}-x86_64.AppImage"
99+
echo "Built: build/Echo-Music-${VERSION}-x86_64.AppImage"
101100

102101
# --- .deb ---
103102
if command -v dpkg-deb &>/dev/null; then
104103
PKG="$REPO_ROOT/build/echo-music_${VERSION}_amd64"
105104
rm -rf "$PKG"
106105
mkdir -p "$PKG/DEBIAN" "$PKG/usr/share/applications" "$PKG/usr/share/icons/hicolor/256x256/apps"
107106
cp -a "$PKG_STAGING/usr/bin" "$PKG/usr/"
108-
cp "$REPO_ROOT/icons/Echo_nobg.png" "$PKG/usr/share/icons/hicolor/256x256/apps/echo.png"
107+
cp "$REPO_ROOT/icons/Echo_nobg.png" "$PKG/usr/share/icons/hicolor/256x256/apps/echo-music.png"
109108
cp "$REPO_ROOT/linux/packaging/echo-music.desktop" "$PKG/usr/share/applications/echo-music.desktop"
110109
sed "s/VERSION/$VERSION/" "$REPO_ROOT/linux/packaging/control.in" > "$PKG/DEBIAN/control"
111110
dpkg-deb --root-owner-group --build "$PKG" "$REPO_ROOT/build/echo-music_${VERSION}_amd64.deb"

linux/packaging/echo-music.desktop

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ Type=Application
33
Name=Echo Music
44
Comment=Music player
55
Exec=echo-music
6-
Icon=echo
6+
Icon=echo-music
77
Categories=AudioVideo;Audio;Music;Player;
8-
StartupWMClass=echo
8+
StartupWMClass=echo-music

linux/packaging/echo.desktop

Lines changed: 0 additions & 8 deletions
This file was deleted.

windows/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Project-level configuration.
22
cmake_minimum_required(VERSION 3.14)
3-
project(echo LANGUAGES CXX)
3+
project(echo-music LANGUAGES CXX)
44

55
# The name of the executable created for the application. Change this to change
66
# the on-disk name of your application.
7-
set(BINARY_NAME "echo")
7+
set(BINARY_NAME "echo-music")
88

99
# Explicitly opt in to modern CMake behaviors to avoid warnings with recent
1010
# versions of CMake.

windows/runner/Runner.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@ BEGIN
8989
BEGIN
9090
BLOCK "040904e4"
9191
BEGIN
92-
VALUE "CompanyName", "com.echo" "\0"
92+
VALUE "CompanyName", "com.echo.music" "\0"
9393
VALUE "FileDescription", "Echo Music" "\0"
9494
VALUE "FileVersion", VERSION_AS_STRING "\0"
95-
VALUE "InternalName", "echo" "\0"
96-
VALUE "LegalCopyright", "Copyright (C) 2026 com.echo. All rights reserved." "\0"
97-
VALUE "OriginalFilename", "echo_music.exe" "\0"
95+
VALUE "InternalName", "echo-music" "\0"
96+
VALUE "LegalCopyright", "Copyright (C) 2026 com.echo.music. All rights reserved." "\0"
97+
VALUE "OriginalFilename", "echo-music.exe" "\0"
9898
VALUE "ProductName", "Echo Music" "\0"
9999
VALUE "ProductVersion", VERSION_AS_STRING "\0"
100100
END

0 commit comments

Comments
 (0)