Skip to content

refactor: clean up KeymanHosts usage and make consistent #272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mcdurdin merged 2 commits into from
Feb 17, 2025
Merged

refactor: clean up KeymanHosts usage and make consistent #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d9a115
refactor: clean up KeymanHosts usage and make consistent
mcdurdin Feb 13, 2025
27bbd75
chore: bootstrap v0.17
mcdurdin Feb 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
## START STANDARD SITE BUILD SCRIPT INCLUDE
readonly THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
readonly BOOTSTRAP="$(dirname "$THIS_SCRIPT")/resources/bootstrap.inc.sh"
readonly BOOTSTRAP_VERSION=v0.11
readonly BOOTSTRAP_VERSION=v0.17
[ -f "$BOOTSTRAP" ] && source "$BOOTSTRAP" || source <(curl -fs https://raw.githubusercontent.com/keymanapp/shared-sites/$BOOTSTRAP_VERSION/bootstrap.inc.sh)
## END STANDARD SITE BUILD SCRIPT INCLUDE

Expand Down
2 changes: 1 addition & 1 deletion tools/2020/DownloadsApi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public static function Instance() {
}

protected function GetData($path) {
return @file_get_contents(KeymanHosts::Instance()->downloads_keyman_com . "/api" . $path);
return @file_get_contents(KeymanHosts::Instance()->SERVER_downloads_keyman_com . "/api" . $path);
}

public function GetPlatformVersion($platform) {
Expand Down
2 changes: 1 addition & 1 deletion tools/2020/SKeymanComApi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public static function Instance() {
}

protected function GetData($path) {
return @file_get_contents(KeymanHosts::Instance()->s_keyman_com . "/api" . $path);
return @file_get_contents(KeymanHosts::Instance()->SERVER_s_keyman_com . "/api" . $path);
}

public function GetKmwVersion() {
Expand Down
4 changes: 2 additions & 2 deletions tools/onlineupdate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ private function BuildKeyboardsResponse($appVersion) {

private function BuildKeyboardResponse($id, $version, $appVersion) {
$platform = $this->platform;
$KeyboardDownload = @file_get_contents(KeymanHosts::Instance()->api_keyman_com."/keyboard/$id");
$KeyboardDownload = @file_get_contents(KeymanHosts::Instance()->SERVER_api_keyman_com."/keyboard/$id");
if($KeyboardDownload === FALSE) {
// not found
return FALSE;
Expand Down Expand Up @@ -188,7 +188,7 @@ private function BuildKeyboardResponse($id, $version, $appVersion) {

private function BuildKeyboardDownloadPath($id, $version) {
// TODO: use DownloadsApi
$data = @file_get_contents(KeymanHosts::Instance()->downloads_keyman_com . "/api/keyboard/$id");
$data = @file_get_contents(KeymanHosts::Instance()->SERVER_downloads_keyman_com . "/api/keyboard/$id");
if($data === FALSE) {
return FALSE;
}
Expand Down