From 90979e494c4c8b4588d99c373b96ae5709ddf006 Mon Sep 17 00:00:00 2001 From: Tad Date: Fri, 20 Oct 2023 18:43:51 -0400 Subject: [PATCH] Updater: point the changelog button to our news page Closes https://github.com/Divested-Mobile/DivestOS-Build/issues/257 Signed-off-by: Tad --- PrebuiltApps | 2 +- Scripts/LineageOS-14.1/Rebrand.sh | 1 + Scripts/LineageOS-15.1/Rebrand.sh | 1 + Scripts/LineageOS-16.0/Rebrand.sh | 1 + Scripts/LineageOS-17.1/Rebrand.sh | 1 + Scripts/LineageOS-18.1/Rebrand.sh | 1 + Scripts/LineageOS-19.1/Rebrand.sh | 1 + Scripts/LineageOS-20.0/Rebrand.sh | 1 + Scripts/init.sh | 1 + 9 files changed, 9 insertions(+), 1 deletion(-) diff --git a/PrebuiltApps b/PrebuiltApps index 31c09f84..01a85941 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit 31c09f842b5ec5e97fee8fff885780834cb0bc7b +Subproject commit 01a8594175bf9ab5c9232d2bd6ed1b28c2544a14 diff --git a/Scripts/LineageOS-14.1/Rebrand.sh b/Scripts/LineageOS-14.1/Rebrand.sh index 38c36ee0..c0722067 100644 --- a/Scripts/LineageOS-14.1/Rebrand.sh +++ b/Scripts/LineageOS-14.1/Rebrand.sh @@ -61,6 +61,7 @@ if enter "packages/apps/Updater"; then sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_BRANDING_SERVER_OTA"'|' src/org/lineageos/updater/misc/Utils.java; sed -i 's|0OTA_SERVER_ONION0|'"$DOS_BRANDING_SERVER_OTA_ONION"'|' src/org/lineageos/updater/misc/Utils.java; sed -i 's|>LineageOS|>'"$DOS_BRANDING_NAME"'|' res/values*/strings.xml; +sed -i 's|https://download.lineageos.org/%1$s/changes|'"$DOS_BRANDING_LINK_NEWS"'|g' res/values*/strings.xml; fi; if enter "system/core"; then diff --git a/Scripts/LineageOS-15.1/Rebrand.sh b/Scripts/LineageOS-15.1/Rebrand.sh index c4c77fd3..6395a9b9 100644 --- a/Scripts/LineageOS-15.1/Rebrand.sh +++ b/Scripts/LineageOS-15.1/Rebrand.sh @@ -72,6 +72,7 @@ if enter "packages/apps/Updater"; then sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_BRANDING_SERVER_OTA"'|' src/org/lineageos/updater/misc/Utils.java; sed -i 's|0OTA_SERVER_ONION0|'"$DOS_BRANDING_SERVER_OTA_ONION"'|' src/org/lineageos/updater/misc/Utils.java; sed -i 's|>LineageOS|>'"$DOS_BRANDING_NAME"'|' res/values*/strings.xml; +sed -i 's|https://download.lineageos.org/%1$s/changes|'"$DOS_BRANDING_LINK_NEWS"'|g' res/values*/strings.xml; fi; if enter "system/core"; then diff --git a/Scripts/LineageOS-16.0/Rebrand.sh b/Scripts/LineageOS-16.0/Rebrand.sh index c51f6873..2da91dba 100644 --- a/Scripts/LineageOS-16.0/Rebrand.sh +++ b/Scripts/LineageOS-16.0/Rebrand.sh @@ -72,6 +72,7 @@ if enter "packages/apps/Updater"; then sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_BRANDING_SERVER_OTA"'|' src/org/lineageos/updater/misc/Utils.java; sed -i 's|0OTA_SERVER_ONION0|'"$DOS_BRANDING_SERVER_OTA_ONION"'|' src/org/lineageos/updater/misc/Utils.java; sed -i 's|>LineageOS|>'"$DOS_BRANDING_NAME"'|' res/values*/strings.xml; +sed -i 's|https://download.lineageos.org/%1$s/changes|'"$DOS_BRANDING_LINK_NEWS"'|g' res/values*/strings.xml; fi; if enter "system/core"; then diff --git a/Scripts/LineageOS-17.1/Rebrand.sh b/Scripts/LineageOS-17.1/Rebrand.sh index 86284679..c3f959b9 100644 --- a/Scripts/LineageOS-17.1/Rebrand.sh +++ b/Scripts/LineageOS-17.1/Rebrand.sh @@ -79,6 +79,7 @@ if enter "packages/apps/Updater"; then sed -i 's|0OTA_SERVER_CLEARNET0|'"$DOS_BRANDING_SERVER_OTA"'|' src/org/lineageos/updater/misc/Utils.java; sed -i 's|0OTA_SERVER_ONION0|'"$DOS_BRANDING_SERVER_OTA_ONION"'|' src/org/lineageos/updater/misc/Utils.java; sed -i 's|>LineageOS|>'"$DOS_BRANDING_NAME"'|' res/values*/strings.xml; +sed -i 's|https://download.lineageos.org/%1$s/changes|'"$DOS_BRANDING_LINK_NEWS"'|g' res/values*/strings.xml; fi; if enter "system/core"; then diff --git a/Scripts/LineageOS-18.1/Rebrand.sh b/Scripts/LineageOS-18.1/Rebrand.sh index 815f96d7..517e0859 100644 --- a/Scripts/LineageOS-18.1/Rebrand.sh +++ b/Scripts/LineageOS-18.1/Rebrand.sh @@ -81,6 +81,7 @@ sed -i 's|0OTA_SERVER_ONION0|'"$DOS_BRANDING_SERVER_OTA_ONION"'|' src/org/lineag sed -i 's|>LineageOS|>'"$DOS_BRANDING_NAME"'|' res/values*/strings.xml; sed -i '/.*toast_forced_update_recovery/s/Lineage/'"$DOS_BRANDING_NAME"'/g' res/values*/strings.xml; sed -i '/.*info_dialog_message/s/Lineage/'"$DOS_BRANDING_NAME"'/g' res/values*/strings.xml; +sed -i 's|https://download.lineageos.org/%1$s/changes|'"$DOS_BRANDING_LINK_NEWS"'|g' res/values*/strings.xml; fi; if enter "system/core"; then diff --git a/Scripts/LineageOS-19.1/Rebrand.sh b/Scripts/LineageOS-19.1/Rebrand.sh index a7333f6d..7a8b1732 100644 --- a/Scripts/LineageOS-19.1/Rebrand.sh +++ b/Scripts/LineageOS-19.1/Rebrand.sh @@ -81,6 +81,7 @@ sed -i 's|0OTA_SERVER_ONION0|'"$DOS_BRANDING_SERVER_OTA_ONION"'|' src/org/lineag sed -i 's|>LineageOS|>'"$DOS_BRANDING_NAME"'|' res/values*/strings.xml; sed -i '/.*toast_forced_update_recovery/s/Lineage/'"$DOS_BRANDING_NAME"'/g' res/values*/strings.xml; sed -i '/.*info_dialog_message/s/Lineage/'"$DOS_BRANDING_NAME"'/g' res/values*/strings.xml; +sed -i 's|https://download.lineageos.org/%1$s/changes|'"$DOS_BRANDING_LINK_NEWS"'|g' res/values*/strings.xml; fi; if enter "system/core"; then diff --git a/Scripts/LineageOS-20.0/Rebrand.sh b/Scripts/LineageOS-20.0/Rebrand.sh index 4f46e564..1c236a67 100644 --- a/Scripts/LineageOS-20.0/Rebrand.sh +++ b/Scripts/LineageOS-20.0/Rebrand.sh @@ -82,6 +82,7 @@ sed -i 's|0OTA_SERVER_ONION0|'"$DOS_BRANDING_SERVER_OTA_ONION"'|' app/src/main/j sed -i 's|>LineageOS|>'"$DOS_BRANDING_NAME"'|' app/src/main/res/values*/strings.xml; sed -i '/.*toast_forced_update_recovery/s/Lineage/'"$DOS_BRANDING_NAME"'/g' app/src/main/res/values*/strings.xml; sed -i '/.*info_dialog_message/s/Lineage/'"$DOS_BRANDING_NAME"'/g' app/src/main/res/values*/strings.xml; +sed -i 's|https://download.lineageos.org/%1$s/changes|'"$DOS_BRANDING_LINK_NEWS"'|g' app/src/main/res/values*/strings.xml; fi; if enter "system/core"; then diff --git a/Scripts/init.sh b/Scripts/init.sh index e646bf00..7329a646 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -95,6 +95,7 @@ export DOS_BRANDING_BOOTANIMATION_STYLE="plasma"; #Options: gradient, plasma #export DOS_BRANDING_BOOTANIMATION_COLOR="#FF5722-#FF8A65"; #gradient export DOS_BRANDING_BOOTANIMATION_COLOR="#FF5722-#03A9F4"; #plasma export DOS_BRANDING_LINK_ABOUT="https://divestos.org/pages/about"; +export DOS_BRANDING_LINK_NEWS="https://divestos.org/pages/news"; export DOS_BRANDING_LINK_PRIVACY="https://divestos.org/pages/privacy_policy"; export DOS_BRANDING_SERVER_OTA="https://divestos.org/updater.php"; export DOS_BRANDING_SERVER_OTA_ONION="$DOS_BRANDING_SERVER_OTA"; #TODO: need to handle allow cleartext