From 8ea9572edbf0facd3f7effeb9f595aca77c8bb60 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 7 Dec 2018 10:21:42 +0000
Subject: [PATCH] Simplify substitution for bad domains
---
src/freedombone-app-fedwiki | 9 ++-------
src/freedombone-template | 8 ++++++++
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/freedombone-app-fedwiki b/src/freedombone-app-fedwiki
index bda70ec18..154e1f15b 100755
--- a/src/freedombone-app-fedwiki
+++ b/src/freedombone-app-fedwiki
@@ -141,14 +141,9 @@ function fedwiki_setting_favicon {
function fedwiki_remove_bad_links {
if [[ $ONION_ONLY == 'no' ]]; then
- sed -i "s|link\\[href='https://maxcdn.bootstrapcdn.com.*|link\\[href='https://${FEDWIKI_DOMAIN_NAME}/fonts-font-awesome/css/font-awesome.min.css']\").length) {|g" /var/lib/wiki/node_modules/wiki-security-friends/client/security.js
-
- sed -i "s|\$('<link rel=\"stylesheet\" href=\"https://maxcdn.bootstrapcdn.com.*|\$('<link rel=\"stylesheet\" href=\"https://${FEDWIKI_DOMAIN_NAME}/fonts-font-awesome/css/font-awesome.min.css\">').appendTo(\"head\");|g" /var/lib/wiki/node_modules/wiki-security-friends/client/security.js
+ sed -i "s|maxcdn.bootstrapcdn.com|${FEDWIKI_DOMAIN_NAME}|g" /var/lib/wiki/node_modules/wiki-security-friends/client/security.js
else
- FEDWIKI_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_fedwiki/hostname)
- sed -i "s|link\\[href='https://maxcdn.bootstrapcdn.com.*|link\\[href='http://${FEDWIKI_ONION_HOSTNAME}/fonts-font-awesome/css/font-awesome.min.css']\").length) {|g" /var/lib/wiki/node_modules/wiki-security-friends/client/security.js
-
- sed -i "s|\$('<link rel=\"stylesheet\" href=\"https://maxcdn.bootstrapcdn.com.*|\$('<link rel=\"stylesheet\" href=\"http://${FEDWIKI_ONION_HOSTNAME}/fonts-font-awesome/css/font-awesome.min.css\">').appendTo(\"head\");|g" /var/lib/wiki/node_modules/wiki-security-friends/client/security.js
+ sed -i "s|maxcdn.bootstrapcdn.com|${FEDWIKI_ONION_HOSTNAME}|g" /var/lib/wiki/node_modules/wiki-security-friends/client/security.js
fi
if [ -f /var/lib/wiki/node_modules/localforage/docs/theme/style.css ]; then
diff --git a/src/freedombone-template b/src/freedombone-template
index ff049d4c6..08f841ebc 100755
--- a/src/freedombone-template
+++ b/src/freedombone-template
@@ -37,6 +37,7 @@ app_name_upper=$(echo "${app_name}" | tr '[:lower:]' '[:upper:]')
app_repo=
app_repo_commit='TODO'
app_php=
+app_go=
app_node=
app_nodeapp=
app_onion_only=
@@ -71,6 +72,7 @@ function show_help {
echo $' --nodeapp [package] Specify a nodejs package to install'
echo $' -o --onion [yes|no] Is this app only available on an onion address?'
echo $' -p --php [yes|no] Is this a PHP app?'
+ echo $' -g --go [yes|no] Is this a Go app?'
echo $' --packages [list of deb package names] Debian packages to be installed'
echo $' --snaps [list of snap package names] Snap packages to be installed'
echo $' -s --daemon [yes|no] Add a daemon'
@@ -125,6 +127,10 @@ do
shift
app_php="$1"
;;
+ -g|--go|--golang)
+ shift
+ app_go="$1"
+ ;;
--node|--nodejs)
shift
app_node="$1"
@@ -692,6 +698,8 @@ if [[ "$app_php" == 'yes' ]]; then
echo ' increment_app_install_progress'
echo ''
fi
+if [[ "$app_go" == 'yes' ]]; then
+fi
if [ $app_webui ]; then
echo " if [ ! \"\$${app_name_upper}_DOMAIN_NAME\" ]; then"
--
GitLab