Skip to content

Commit

Permalink
Rename downloader artifacts/title
Browse files Browse the repository at this point in the history
  • Loading branch information
dlon committed Feb 25, 2025
1 parent d298df9 commit 22cd6c7
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/downloader.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
- name: Check file size
uses: ./.github/actions/check-file-size
with:
artifact: "./installer-downloader/dist/MullvadDownloader.exe"
artifact: "./installer-downloader/dist/mullvad-downloader.exe"
max_size: ${{ env.MAX_BINARY_SIZE }}

build-macos:
Expand All @@ -77,5 +77,5 @@ jobs:
- name: Check file size
uses: ./.github/actions/check-file-size
with:
artifact: "./installer-downloader/dist/MullvadDownloader.dmg"
artifact: "./installer-downloader/dist/mullvad-downloader.dmg"
max_size: ${{ env.MAX_BINARY_SIZE }}
10 changes: 5 additions & 5 deletions installer-downloader/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ function dist_macos_app {

# Pack in .dmg
log_info "Creating $dmg_path image..."
hdiutil create -volname "MullvadDownloader" -srcfolder "$app_path" -ov -format UDZO \
hdiutil create -volname "mullvad-downloader" -srcfolder "$app_path" -ov -format UDZO \
"$dmg_path"

# Sign .dmg
Expand Down Expand Up @@ -245,7 +245,7 @@ function sign_win {
log_info "Signing $binary..."
if signtool sign \
-tr http://timestamp.digicert.com -td sha256 \
-fd sha256 -d "Mullvad VPN downloader" \
-fd sha256 -d "Mullvad VPN installer" \
-du "https://github.com/mullvad/mullvadvpn-app#readme" \
-sha1 "$CERT_HASH" "$binary"
then
Expand All @@ -262,11 +262,11 @@ function sign_win {

# Copy executable and optionally sign it.
function dist_windows_app {
cp "$CARGO_TARGET_DIR/release/installer-downloader.exe" "$BUILD_DIR/MullvadDownloader.exe"
cp "$CARGO_TARGET_DIR/release/installer-downloader.exe" "$BUILD_DIR/mullvad-downloader.exe"
if [[ "$SIGN" != "false" ]]; then
sign_win "$BUILD_DIR/MullvadDownloader.exe"
sign_win "$BUILD_DIR/mullvad-downloader.exe"
fi
mv "$BUILD_DIR/MullvadDownloader.exe" "$DIST_DIR/"
mv "$BUILD_DIR/mullvad-downloader.exe" "$DIST_DIR/"
}

function main {
Expand Down
2 changes: 1 addition & 1 deletion installer-downloader/src/cacao_impl/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ mod delegate;
mod ui;

pub fn main() {
let app = App::new("net.mullvad.downloader", AppImpl::default());
let app = App::new("net.mullvad.MullvadDownloader", AppImpl::default());

let cb: Mutex<Option<ui::MainThreadCallback>> = Mutex::new(Some(Box::new(|self_| {
crate::controller::initialize_controller(self_);
Expand Down
2 changes: 1 addition & 1 deletion installer-downloader/src/resource.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! Shared text and other resources
/// Window title
pub const WINDOW_TITLE: &str = "Mullvad VPN downloader";
pub const WINDOW_TITLE: &str = "Mullvad VPN installer";
/// Window width
pub const WINDOW_WIDTH: usize = 600;
/// Window height
Expand Down

0 comments on commit 22cd6c7

Please sign in to comment.