hotfix for bad installer

This commit is contained in:
Seth Call 2021-05-18 17:42:18 -05:00
parent fa9a976895
commit 128e9c6bb4
4 changed files with 39 additions and 4 deletions

View File

@ -61,7 +61,7 @@
return false;
})
}
else if (templateId == "update-restarting" || templateId == "update-error") {
else if (templateId == "update-restarting" || templateId == "update-error" || templateId == "manual-upgrade") {
$("#client_update a.open-downloads").click(function () {
context.JK.popExternalLink("https://www.jamkazam.com/downloads")
@ -243,7 +243,13 @@
// this will update the client dialog to how it should look when an update is just starting
// and show it front-and-center on the screen
updateClientUpdateDialog("update-start", { uri: updateUri })
// XXX HACK
if(updateUri && gon.global.manual_override_installer_ends_with && updateUri.endsWith(gon.global.manual_override_installer_ends_with)) {
updateClientUpdateDialog("manual-upgrade", { uri: updateUri })
}
else {
updateClientUpdateDialog("update-start", { uri: updateUri })
}
}
}
@ -251,6 +257,7 @@
function check() {
var os = context.JK.GetOSAsString();
//os = 'Win32'
// check kill switch before all other logic
if (!gon.check_for_client_updates) {

View File

@ -100,6 +100,32 @@
</div>
<!--
<div class="right">
<a href="#" class="button-grey close-application">CANCEL AND CLOSE APPLICATION</a>
</div>
-->
</script>
<script type="text/template" id="template-manual-upgrade">
<h2 align="center">New Client Available</h2>
<br />
<div align="center">
<div class="download-manual">
<p class="fix"><b>Step 1:</b> Uninstall the JamKazam application manually.</p>
<br/>
<p class="fix"><b>Step 2:</b> Download the latest JamKazam installer from <a class="open-downloads" href="/downloads" rel="external">our downloads page.</a></p><br/>
<p class="fix"><b>Step 3:</b> Double-click the downloaded file, and then drag & drop the Jamkazam application into your Applications folder.</p>
</div>
<div class="error-detail">
Our automatic updater is temporarily not working for Mac OS on this release.
</div>
</div>
<!--
<div class="right">
<a href="#" class="button-grey close-application">CANCEL AND CLOSE APPLICATION</a>

View File

@ -507,5 +507,6 @@ if defined?(Bundler)
config.video_conferencing_host = "https://webrtc-demo.jamkazam.com"
config.latency_data_host = "http://localhost:4001"
config.latency_data_host_auth_code = "c2VydmVyOnBhc3N3b3Jk"
config.manual_override_installer_ends_with = "JamKazam-1.0.3776.dmg"
end
end

View File

@ -30,5 +30,6 @@ Gon.global.subscription_codes = Rails.application.config.subscription_codes
Gon.global.braintree_token = Rails.application.config.braintree_token
Gon.global.paypal_admin_only = Rails.application.config.paypal_admin_only
Gon.global.use_video_conferencing_server = Rails.application.config.use_video_conferencing_server
Gon.global.manual_override_installer_ends_with = Rails.application.config.manual_override_installer_ends_with
Gon.global.env = Rails.env
Gon.global.version = ::JamWeb::VERSION