From 65175b4362e01a7bf2f373dc100b7fb0ec4cf44c Mon Sep 17 00:00:00 2001 From: Chris Young Date: Fri, 1 Jul 2016 17:37:09 +0100 Subject: [PATCH] Make Amiga SearchEngines file out of the global one plus our own additions --- frontends/amiga/Makefile | 3 ++- frontends/amiga/pkg/SearchEngines | 2 ++ frontends/amiga/resources/SearchEngines | 22 ---------------------- 3 files changed, 4 insertions(+), 23 deletions(-) create mode 100644 frontends/amiga/pkg/SearchEngines delete mode 100644 frontends/amiga/resources/SearchEngines diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile index d5433c8f3..22bf85b7a 100644 --- a/frontends/amiga/Makefile +++ b/frontends/amiga/Makefile @@ -65,7 +65,7 @@ install-amiga: package-amiga: netsurf.lha AMIGA_LANGUAGES := de en it ja nl -AMIGA_PLATFORM_RESOURCES := Pointers Themes default.css default.css.info favicon.png LangNames mimetypes Resource.map SearchEngines splash.png +AMIGA_PLATFORM_RESOURCES := Pointers Themes default.css default.css.info favicon.png LangNames mimetypes Resource.map splash.png AMIGA_GENERIC_RESOURCES := $(AMIGA_LANGUAGES) ca-bundle Icons AMIGA_RESOURCES := $(addprefix $(FRONTEND_SOURCE_DIR)/resources/,$(AMIGA_PLATFORM_RESOURCES)) $(addprefix \!NetSurf/Resources/,$(AMIGA_GENERIC_RESOURCES)) AMIGA_DISTRIBUTION_FILES := $(FRONTEND_SOURCE_DIR)/dist/* @@ -80,6 +80,7 @@ netsurf.lha: $(EXETARGET) $(Q)mkdir $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources $(Q)cp -r $(AMIGA_RESOURCES) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources $(Q)cp -r $(AMIGA_DISTRIBUTION_FILES) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf + $(Q)cat resources/SearchEngines $(AMIGA_PKG_DIR)/SearchEngines >$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/SearchEngines $(Q)cp \!NetSurf/Resources/AdBlock,f79 $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/adblock.css $(Q)cp \!NetSurf/Resources/CSS,f79 $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/nsdefault.css $(Q)cp \!NetSurf/Resources/internal.css,f79 $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/internal.css diff --git a/frontends/amiga/pkg/SearchEngines b/frontends/amiga/pkg/SearchEngines new file mode 100644 index 000000000..3f4bdd95b --- /dev/null +++ b/frontends/amiga/pkg/SearchEngines @@ -0,0 +1,2 @@ +Aminet|www.aminet.net|http://aminet.net/search?query=%s|http://aminet.net/favicon.ico| +OS4Depot|www.os4depot.net|http://www.os4depot.net/index.php?function=search&tool=simple&f_fields=%s|http://www.os4depot.net/favicon.ico| diff --git a/frontends/amiga/resources/SearchEngines b/frontends/amiga/resources/SearchEngines deleted file mode 100644 index f1b705a0a..000000000 --- a/frontends/amiga/resources/SearchEngines +++ /dev/null @@ -1,22 +0,0 @@ -Google|www.google.com|http://www.google.com/search?q=%s|http://www.google.com/favicon.ico| -Yahoo|search.yahoo.com|http://search.yahoo.com/search?p=%s|http://www.yahoo.com/favicon.ico| -Bing|www.bing.com|http://www.bing.com/search?q=%s|http://www.bing.com/favicon.ico| -Business.com|www.business.com|http://www.business.com/search/rslt_default.asp?query=%s|http://www.business.com/favicon.ico| -Omgili|www.omgili.com|http://www.omgili.com/AAAAA/%s.html|http://www.omgili.com/favicon.ico| -BBC News|search.bbc.co.uk|http://search.bbc.co.uk/search?q=%s&tab=ns|http://news.bbc.co.uk/favicon.ico| -Creative Commons|creativecommons.org|http://creativecommons.org/?s=%s|http://creativecommons.org/favicon.ico| -Ask.com|www.ask.com|http://www.ask.com/web?q=%s|http://www.ask.com/favicon.ico| -Answers.com|www.answers.com|http://www.answers.com/%s|http://www.answers.com/favicon.ico| -Dictionary.com|dictionary.reference.com|http://dictionary.reference.com/browse/%s?jss=0|http://dictionary.reference.com/favicon.ico| -Youtube|www.youtube.com|http://www.youtube.com/results?search_query=%s|http://www.youtube.com/favicon.ico| -AeroMp3|www.aeromp3.com|http://www.aeromp3.com/search?q=%s|http://www.aeromp3.com/favicon.ico| -AOL|search.aol.com|http://search.aol.com/aol/search?query=%s|http://www.aol.com/favicon.ico| -Baidu|www.baidu.com|http://www.baidu.com/s?wd=%s|http://www.baidu.com/favicon.ico| -Amazon|www.amazon.com|http://www.amazon.com/s/ref=nb_ss_gw?field-keywords=%s|http://www.amazon.com/favicon.ico| -Ebay|shop.ebay.com|http://shop.ebay.com/items/%s|http://www.ebay.com/favicon.ico| -IMDB|www.imdb.com|http://www.imdb.com/find?q=%s|http://www.imdb.com/favicon.ico| -ESPN|search.espn.go.com|http://search.espn.go.com/%s/|http://www.espn.go.com/favicon.ico| -Wikipedia|en.wikipedia.org|http://en.wikipedia.org/w/index.php?title=Special%%3ASearch&search=%s|http://en.wikipedia.org/favicon.ico| -Aminet|www.aminet.net|http://aminet.net/search?query=%s|http://aminet.net/favicon.ico| -OS4Depot|www.os4depot.net|http://www.os4depot.net/index.php?function=search&tool=simple&f_fields=%s|http://www.os4depot.net/favicon.ico| -DuckDuckGo|www.duckduckgo.com|http://www.duckduckgo.com/?q=%s|http://www.duckduckgo.com/favicon.ico|