From 206d683c0162a34048578ec59a03238e4c7c42a7 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 3 Dec 2017 17:42:55 +0000
Subject: [PATCH] Switch mesh browser from midori to firefox

---
 src/freedombone-image-customise | 9 +++++----
 src/freedombone-image-mesh      | 4 ++--
 src/freedombone-mesh-visit-site | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index fc77b551..8e25e8a9 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -99,7 +99,8 @@ INSECURE='no'
 MESH_DESKTOP_BACKGROUND_IMAGE=/usr/local/share/${PROJECT_NAME}_mesh_initial_background.png
 
 # The browser application to use
-BROWSER=midori
+BROWSER=firefox
+BROWSER_OPTIONS='-url'
 
 MESH_INSTALL_DIR=/var/lib
 
@@ -946,7 +947,7 @@ if [ \$no_of_users -gt 0 ]; then
             echo 'Comment[it]=Editing collaborativo di documenti in tempo reale' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
             echo 'Comment[ru]=Совместное редактирование документов в режиме реального времени' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
             echo 'Comment[zh]=实时协同编辑文件' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
-            echo "Exec=$BROWSER http://\${HOSTNAME}.local" >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
+            echo "Exec=$BROWSER $BROWSER_OPTIONS http://\${HOSTNAME}.local" >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
             echo "Icon=/usr/share/$PROJECT_NAME/avatars/icon_cryptpad.png" >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
             echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
             echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
@@ -954,7 +955,7 @@ if [ \$no_of_users -gt 0 ]; then
             chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/cryptpad.desktop
         else
             if ! grep -q "\${HOSTNAME}.local" /home/$MY_USERNAME/Desktop/cryptpad.desktop; then
-                sed -i "s|Exec=.*|Exec=$BROWSER http://\${HOSTNAME}.local|g" /home/$MY_USERNAME/Desktop/cryptpad.desktop
+                sed -i "s|Exec=.*|Exec=$BROWSER $BROWSER_OPTIONS http://\${HOSTNAME}.local|g" /home/$MY_USERNAME/Desktop/cryptpad.desktop
             fi
         fi
     fi
@@ -1250,7 +1251,7 @@ EOF
     fi
 
     # browser
-    chroot "$rootdir" apt-get -yq install $BROWSER
+    chroot "$rootdir" apt-get -yq install firefox-esr
 
     # help
     mkdir -p $rootdir/home/${MY_USERNAME}/help/images
diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh
index b8cfa6ef..14a73c22 100755
--- a/src/freedombone-image-mesh
+++ b/src/freedombone-image-mesh
@@ -32,8 +32,8 @@ export TEXTDOMAIN=${PROJECT_NAME}-image-mesh
 export TEXTDOMAINDIR="/usr/share/locale"
 
 # The browser application to use
-BROWSER=midori
-BROWSER_OPTIONS='-p'
+BROWSER=firefox
+BROWSER_OPTIONS='-private -url'
 
 MY_USERNAME='fbone'
 PEER_ID=
diff --git a/src/freedombone-mesh-visit-site b/src/freedombone-mesh-visit-site
index 58de73e5..c2342b61 100755
--- a/src/freedombone-mesh-visit-site
+++ b/src/freedombone-mesh-visit-site
@@ -34,8 +34,8 @@ export TEXTDOMAINDIR="/usr/share/locale"
 IPFS_URL='http://127.0.0.1:8080/ipns'
 
 # The browser application to use
-BROWSER=midori
-BROWSER_OPTIONS='-p'
+BROWSER=firefox
+BROWSER_OPTIONS='-url'
 
 # An optional suffix to be appended to the URL
 SUFFIX=$1