Selaa lähdekoodia

Switch mesh browser from midori to firefox

Bob Mottram 7 vuotta sitten
vanhempi
commit
206d683c01

+ 5
- 4
src/freedombone-image-customise Näytä tiedosto

99
 MESH_DESKTOP_BACKGROUND_IMAGE=/usr/local/share/${PROJECT_NAME}_mesh_initial_background.png
99
 MESH_DESKTOP_BACKGROUND_IMAGE=/usr/local/share/${PROJECT_NAME}_mesh_initial_background.png
100
 
100
 
101
 # The browser application to use
101
 # The browser application to use
102
-BROWSER=midori
102
+BROWSER=firefox
103
+BROWSER_OPTIONS='-url'
103
 
104
 
104
 MESH_INSTALL_DIR=/var/lib
105
 MESH_INSTALL_DIR=/var/lib
105
 
106
 
946
             echo 'Comment[it]=Editing collaborativo di documenti in tempo reale' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
947
             echo 'Comment[it]=Editing collaborativo di documenti in tempo reale' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
947
             echo 'Comment[ru]=Совместное редактирование документов в режиме реального времени' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
948
             echo 'Comment[ru]=Совместное редактирование документов в режиме реального времени' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
948
             echo 'Comment[zh]=实时协同编辑文件' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
949
             echo 'Comment[zh]=实时协同编辑文件' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
949
-            echo "Exec=$BROWSER http://\${HOSTNAME}.local" >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
950
+            echo "Exec=$BROWSER $BROWSER_OPTIONS http://\${HOSTNAME}.local" >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
950
             echo "Icon=/usr/share/$PROJECT_NAME/avatars/icon_cryptpad.png" >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
951
             echo "Icon=/usr/share/$PROJECT_NAME/avatars/icon_cryptpad.png" >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
951
             echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
952
             echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
952
             echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
953
             echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
954
             chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/cryptpad.desktop
955
             chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/cryptpad.desktop
955
         else
956
         else
956
             if ! grep -q "\${HOSTNAME}.local" /home/$MY_USERNAME/Desktop/cryptpad.desktop; then
957
             if ! grep -q "\${HOSTNAME}.local" /home/$MY_USERNAME/Desktop/cryptpad.desktop; then
957
-                sed -i "s|Exec=.*|Exec=$BROWSER http://\${HOSTNAME}.local|g" /home/$MY_USERNAME/Desktop/cryptpad.desktop
958
+                sed -i "s|Exec=.*|Exec=$BROWSER $BROWSER_OPTIONS http://\${HOSTNAME}.local|g" /home/$MY_USERNAME/Desktop/cryptpad.desktop
958
             fi
959
             fi
959
         fi
960
         fi
960
     fi
961
     fi
1250
     fi
1251
     fi
1251
 
1252
 
1252
     # browser
1253
     # browser
1253
-    chroot "$rootdir" apt-get -yq install $BROWSER
1254
+    chroot "$rootdir" apt-get -yq install firefox-esr
1254
 
1255
 
1255
     # help
1256
     # help
1256
     mkdir -p $rootdir/home/${MY_USERNAME}/help/images
1257
     mkdir -p $rootdir/home/${MY_USERNAME}/help/images

+ 2
- 2
src/freedombone-image-mesh Näytä tiedosto

32
 export TEXTDOMAINDIR="/usr/share/locale"
32
 export TEXTDOMAINDIR="/usr/share/locale"
33
 
33
 
34
 # The browser application to use
34
 # The browser application to use
35
-BROWSER=midori
36
-BROWSER_OPTIONS='-p'
35
+BROWSER=firefox
36
+BROWSER_OPTIONS='-private -url'
37
 
37
 
38
 MY_USERNAME='fbone'
38
 MY_USERNAME='fbone'
39
 PEER_ID=
39
 PEER_ID=

+ 2
- 2
src/freedombone-mesh-visit-site Näytä tiedosto

34
 IPFS_URL='http://127.0.0.1:8080/ipns'
34
 IPFS_URL='http://127.0.0.1:8080/ipns'
35
 
35
 
36
 # The browser application to use
36
 # The browser application to use
37
-BROWSER=midori
38
-BROWSER_OPTIONS='-p'
37
+BROWSER=firefox
38
+BROWSER_OPTIONS='-url'
39
 
39
 
40
 # An optional suffix to be appended to the URL
40
 # An optional suffix to be appended to the URL
41
 SUFFIX=$1
41
 SUFFIX=$1