Switch mesh browser from midori to firefox

This commit is contained in:
Bob Mottram 2017-12-03 17:42:55 +00:00
parent e88753d38b
commit 206d683c01
3 changed files with 9 additions and 8 deletions

View File

@ -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

View File

@ -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=

View File

@ -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