From 7c69b2a9fc8731835d748dedc408f06db4be9f59 Mon Sep 17 00:00:00 2001 From: odrling Date: Sun, 1 Sep 2019 21:00:21 +0200 Subject: [PATCH] put 'x64' after release version --- .ci/upload_win_installer.sh | 2 +- src/dialog_version_check.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/upload_win_installer.sh b/.ci/upload_win_installer.sh index da3364178..90070e94d 100644 --- a/.ci/upload_win_installer.sh +++ b/.ci/upload_win_installer.sh @@ -4,6 +4,6 @@ dest="ftp://shelter.mahoro-net.org/aegisub-japan7" tag=$(git describe --exact-match) [ "$tag" ] || exit -curl -T 'packages\win_installer\output\Aegisub-Japan7-x64.exe' --user $FTP_USER:$FTP_PASS "$dest/Aegisub-Japan7-x64-${tag#v}.exe" +curl -T 'packages\win_installer\output\Aegisub-Japan7-x64.exe' --user $FTP_USER:$FTP_PASS "$dest/Aegisub-Japan7-${tag#v}-x64.exe" printf "${tag#v}\n$(git tag -l --format='%contents' $tag)" > latest curl -T latest --user "$FTP_USER:$FTP_PASS" "$dest/" diff --git a/src/dialog_version_check.cpp b/src/dialog_version_check.cpp index 7248e48e9..606b47f3e 100644 --- a/src/dialog_version_check.cpp +++ b/src/dialog_version_check.cpp @@ -159,7 +159,7 @@ VersionCheckerResultDialog::VersionCheckerResultDialog(wxString const& main_text main_sizer->Add(descbox, 0, wxEXPAND|wxBOTTOM, 6); std::ostringstream surl; - surl << "http://" << UPDATE_CHECKER_SERVER << UPDATE_CHECKER_BASE_URL << "/Aegisub-Japan7-x64-" << AegisubVersion(update) << ".exe"; + surl << "http://" << UPDATE_CHECKER_SERVER << UPDATE_CHECKER_BASE_URL << "/Aegisub-Japan7-" << AegisubVersion(update) << "-x64.exe"; std::string url = surl.str(); main_sizer->Add(new wxHyperlinkCtrl(this, -1, to_wx(url), to_wx(url)), 0, wxALIGN_LEFT|wxBOTTOM, 6);