From c1eafe0f8f2626ac4775ca37f99ca7b7f06ab0de Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Thu, 6 Aug 2020 15:42:19 +0200 Subject: [PATCH] Remove most mentions of pmOS / make them optional --- Makefile | 8 +++- src/{home.html => homepage/bottom.html} | 61 ------------------------- src/homepage/distro_links.html | 4 ++ src/homepage/head.html | 57 +++++++++++++++++++++++ src/policies.json | 2 +- src/prefs.js | 2 - 6 files changed, 68 insertions(+), 66 deletions(-) rename src/{home.html => homepage/bottom.html} (56%) create mode 100644 src/homepage/distro_links.html create mode 100644 src/homepage/head.html diff --git a/Makefile b/Makefile index 31f2ee3..f7ba28f 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,6 @@ USERCHROME_FILES := root.css urlbar.css appMenu.css +HOMEPAGE_FILES := head.html distro_links.html bottom.html +DISTRO := postmarketOS all: out/home.html out/policies.json out/prefs.js out/userChrome.css @@ -7,8 +9,10 @@ clean: out: mkdir out -out/home.html: src/home.html out - cat $< > $@ +out/home.html: src/homepage/*.html out + ( cd src/homepage; cat $(HOMEPAGE_FILES) ) > $@.temp + sed "s/@DISTRO@/$(DISTRO)/g" "$@.temp" > "$@" + rm "$@.temp" out/policies.json: src/policies.json out cat $< > $@ diff --git a/src/home.html b/src/homepage/bottom.html similarity index 56% rename from src/home.html rename to src/homepage/bottom.html index 1980a95..43cbd52 100644 --- a/src/home.html +++ b/src/homepage/bottom.html @@ -1,64 +1,3 @@ - - - -Welcome to Firefox on postmarketOS - - - - -

- Welcome to Firefox on postmarketOS -

-

- blog - - wiki -

This is the desktop version of Firefox, but with a diff --git a/src/homepage/distro_links.html b/src/homepage/distro_links.html new file mode 100644 index 0000000..33c0d2b --- /dev/null +++ b/src/homepage/distro_links.html @@ -0,0 +1,4 @@ +

+ blog - + wiki +

diff --git a/src/homepage/head.html b/src/homepage/head.html new file mode 100644 index 0000000..456926d --- /dev/null +++ b/src/homepage/head.html @@ -0,0 +1,57 @@ + + + +Welcome to Firefox on @DISTRO@ + + + + +

+ Welcome to Firefox on @DISTRO@ +

diff --git a/src/policies.json b/src/policies.json index 718e292..cc02cf3 100644 --- a/src/policies.json +++ b/src/policies.json @@ -11,7 +11,7 @@ "OverridePostUpdatePage": "", "Homepage": { - "URL": "file:///usr/share/postmarketos-config-firefox/home.html", + "URL": "file:///usr/share/mobile-config-firefox/home.html", "Locked": false, "StartPage": "homepage" }, diff --git a/src/prefs.js b/src/prefs.js index 2b8c078..2a1d7c7 100644 --- a/src/prefs.js +++ b/src/prefs.js @@ -1,5 +1,3 @@ -/** Firefox tweaks for postmarketOS **/ - // Select a mobile user agent for firefox (same as tor browser on android) pref('general.useragent.override', 'Mozilla/5.0 (Android 6.0; Mobile; rv:68.0) Gecko/20100101 Firefox/68.0');