From d534d0d8d2b9e152690d2e15a7256d875c5af4cb Mon Sep 17 00:00:00 2001
From: idk <hankhill19580@gmail.com>
Date: Wed, 1 Dec 2021 22:31:18 -0500
Subject: [PATCH] Fix OSX bundle version numbers so they can be out of sync
with core version numbers
---
i2p2www/__init__.py | 1 +
i2p2www/pages/downloads/mac.html | 6 +++---
i2p2www/pages/downloads/macros | 12 ++++++------
i2p2www/templatevars.py | 9 +++++++++
4 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/i2p2www/__init__.py b/i2p2www/__init__.py
index bb0188903..c0a671efd 100644
--- a/i2p2www/__init__.py
+++ b/i2p2www/__init__.py
@@ -24,6 +24,7 @@ except ImportError:
CURRENT_I2P_VERSION = '1.6.1'
CURRENT_I2P_FIREFOX_PROFILE_VERSION = '1.05.0'
+CURRENT_I2P_OSX_VERSION = '1.5.0'
CANONICAL_DOMAIN = 'geti2p.net'
diff --git a/i2p2www/pages/downloads/mac.html b/i2p2www/pages/downloads/mac.html
index 18eca2d39..b747ec004 100644
--- a/i2p2www/pages/downloads/mac.html
+++ b/i2p2www/pages/downloads/mac.html
@@ -47,11 +47,11 @@ that are familiar and built-into the operating system.
{% call package_outer('osx', name, icon) %}
<div class = "file">
- <a class = "default" href="{{ url_for('downloads_redirect', version=ver(), net=def_mirror.net, protocol=def_mirror.protocol, domain=def_mirror.domain, file=ver(filename) )}}">
- <span class = "name">{{ ver(filename) }}</span><br/>
+ <a class = "default" href="{{ url_for('downloads_redirect', version=mver(), net=def_mirror.net, protocol=def_mirror.protocol, domain=def_mirror.domain, file=mver(filename) )}}">
+ <span class = "name">{{ mver(filename) }}</span><br/>
<span class="mirror">{{ _('Mirror:') }} <img src="{{ url_for('static', filename='images/flags/'+def_mirror.country+'.png') }}" /> {{ def_mirror.org }}</span>
</a>
- <a class="mirrors" href="{{ get_url('downloads_select', version=ver(), file=ver(filename)) }}">{{ _('select alternate mirror') }}</a>
+ <a class="mirrors" href="{{ get_url('downloads_select', version=mver(), file=mver(filename)) }}">{{ _('select alternate mirror') }}</a>
</div>
<div class="meta">
<div class="hash">
diff --git a/i2p2www/pages/downloads/macros b/i2p2www/pages/downloads/macros
index 203351ee9..0d06534d9 100644
--- a/i2p2www/pages/downloads/macros
+++ b/i2p2www/pages/downloads/macros
@@ -1,12 +1,12 @@
-{% set i2pinstall_windows_hash = '2c9c382852e17e124d77a2bf28f95056599fd458f8de77adcf8e2aaa22b3ef81' %}
-{% set i2pinstall_jar_hash = '8c843c90870223b4808065761d059a02b168b74daddd1773c36f0a0245e201f9' %}
-{% set i2psource_hash = '26e5f4d95b1a0766870f97b30e57c9a8e98690279c3bf09198e30effabecc450' %}
-{% set i2pupdate_hash = 'ea1b4b8095f4d6f5568ce879242e1d5b077de1beb4366f4a75a75cffd559ee7f' %}
-{% set i2p_android_hash = '6ed5622ea592f4e5d24723a8525147d4bd30b94ada7b2e6613c683df583e826a' %}
+{% set i2pinstall_windows_hash = 'c5d5757d0cc1f4ce0cf2a663c35ca173d0cfe4ef0f38ac50b1be116787b03c87' %}
+{% set i2pinstall_jar_hash = '2ae90f28d51b84796079430bde53589e1c2117125d5fb7bb5c036c4e1ad1eb80' %}
+{% set i2psource_hash = '719606c4cb510de4fe74f24bbfa53911a70531821fc1ee79a29e3d96eaa16733' %}
+{% set i2pupdate_hash = '5fe7982cc1499872864a022507d0850627448d62ef65e0a7b5c172144a04368d' %}
+{% set i2p_android_hash = '7bc61b03145fe5518cc4916e3ef9aaaed700e964b4bfd41718f3247aa993a240' %}
{% set i2p_macnative_hash = '70447e8a352654afd940cfc6c05f094732de7ab05db7c42c173e49f37259d601' %}
{% set i2p_windows_subver = '' %}
-{% set i2p_macosx_launcher_version = '0.1.8' %}
+{% set i2p_macosx_launcher_version = '1.5.0' %}
{% set i2p_android_version = '1.6.0' %}
{% set i2p_android_version_kytv = '0.9.22' %}
diff --git a/i2p2www/templatevars.py b/i2p2www/templatevars.py
index 83bfd122b..b6d4e27fb 100644
--- a/i2p2www/templatevars.py
+++ b/i2p2www/templatevars.py
@@ -7,6 +7,7 @@ from i2p2www import (
CANONICAL_DOMAIN,
CURRENT_I2P_VERSION,
CURRENT_I2P_FIREFOX_PROFILE_VERSION,
+ CURRENT_I2P_OSX_VERSION,
PROPOSAL_DIR,
RTL_LANGS,
SUPPORTED_LANGS,
@@ -210,6 +211,13 @@ def utility_processor():
return string % CURRENT_I2P_FIREFOX_PROFILE_VERSION
return CURRENT_I2P_FIREFOX_PROFILE_VERSION
+ def get_current_osx_bundle_version(string=None, ver=None):
+ if string:
+ if ver:
+ return string % ver
+ return string % CURRENT_I2P_OSX_VERSION
+ return CURRENT_I2P_OSX_VERSION
+
def browser_current_version():
return BROWSER_VERSION
@@ -236,6 +244,7 @@ def utility_processor():
get_flag=get_flag,
ver=get_current_version,
pver=get_current_firefox_profile_version,
+ mver=get_current_osx_bundle_version,
canonical=get_canonical_link,
browser_version=browser_current_version,
browser_name=browser_short_name,
--
GitLab