X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F90-update-alternatives;h=9c3d1885a9e8308fd23775714e0413dac014d54a;hp=7b541f56ca0d1886e8d658175a33888054059da7;hb=HEAD;hpb=e4cf0358a216b41108c7a3e055111a3bb517d92e

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
index 7b541f5..9c3d188 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
+++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
@@ -9,24 +9,32 @@
 set -u
 set -e
 
-if $ROOTCMD update-alternatives --list editor 2>/dev/null | grep -q vim.gtk ; then
+# starting with vim v2:8.1.2136-1 it uses /usr/libexec/vim for the vim.* binaries
+if $ROOTCMD update-alternatives --list editor 2>/dev/null | grep -q /usr/libexec/vim ; then
+  VIM_PATH=/usr/libexec/vim
+else # for backwards compatibility
+  VIM_PATH=/usr/bin
+fi
+
+if $ROOTCMD update-alternatives --list editor 2>/dev/null | grep -q 'vim.gtk3' ; then
+  echo "Setting vim.gtk3 as editor using update-alternatives."
+  $ROOTCMD update-alternatives --set editor "${VIM_PATH}"/vim.gtk3
+  $ROOTCMD update-alternatives --set vi     "${VIM_PATH}"/vim.gtk3
+  $ROOTCMD update-alternatives --set vim    "${VIM_PATH}"/vim.gtk3
+elif $ROOTCMD update-alternatives --list editor 2>/dev/null | grep -q 'vim.gtk$' ; then
   echo "Setting vim.gtk as editor using update-alternatives."
-  $ROOTCMD update-alternatives --set editor /usr/bin/vim.gtk
-  $ROOTCMD update-alternatives --set vi     /usr/bin/vim.gtk
-  $ROOTCMD update-alternatives --set vim    /usr/bin/vim.gtk
-  $ROOTCMD update-alternatives --set view   /usr/bin/vim.gtk
-elif $ROOTCMD update-alternatives --list editor 2>/dev/null | grep -q vim.basic ; then
+  $ROOTCMD update-alternatives --set editor "${VIM_PATH}"/vim.gtk
+  $ROOTCMD update-alternatives --set vi     "${VIM_PATH}"/vim.gtk
+  $ROOTCMD update-alternatives --set vim    "${VIM_PATH}"/vim.gtk
+elif $ROOTCMD update-alternatives --list editor 2>/dev/null | grep -q 'vim.basic' ; then
   echo "Setting vim.basic as editor using update-alternatives."
-  $ROOTCMD update-alternatives --set editor /usr/bin/vim.basic
-  $ROOTCMD update-alternatives --set vi     /usr/bin/vim.basic
-  $ROOTCMD update-alternatives --set vim    /usr/bin/vim.basic
-  $ROOTCMD update-alternatives --set view   /usr/bin/vim.basic
-elif $ROOTCMD update-alternatives --list editor 2>/dev/null | grep -q vim.tiny ; then
+  $ROOTCMD update-alternatives --set editor "${VIM_PATH}"/vim.basic
+  $ROOTCMD update-alternatives --set vi     "${VIM_PATH}"/vim.basic
+  $ROOTCMD update-alternatives --set vim    "${VIM_PATH}"/vim.basic
+elif $ROOTCMD update-alternatives --list editor 2>/dev/null | grep -q 'vim.tiny' ; then
   echo "Setting vim.tiny as editor using update-alternatives."
-  $ROOTCMD update-alternatives --set editor /usr/bin/vim.tiny
-  $ROOTCMD update-alternatives --set vi     /usr/bin/vim.tiny
-  $ROOTCMD update-alternatives --set vim    /usr/bin/vim.tiny
-  $ROOTCMD update-alternatives --set view   /usr/bin/vim.tiny
+  $ROOTCMD update-alternatives --set editor "${VIM_PATH}"/vim.tiny
+  $ROOTCMD update-alternatives --set vi     "${VIM_PATH}"/vim.tiny
 else
   echo "Warning: No vim binary suitable for update-alternatives found."
 fi
@@ -49,6 +57,11 @@ if $ROOTCMD update-alternatives --list x-www-browser 2>/dev/null | grep -q '/ice
   $ROOTCMD update-alternatives --set x-www-browser /usr/bin/iceweasel
 fi
 
+if $ROOTCMD update-alternatives --list x-www-browser 2>/dev/null | grep -q '/firefox-esr' ; then
+  echo "Setting firefox-esr as x-www-browser using update-alternatives."
+  $ROOTCMD update-alternatives --set x-www-browser /usr/bin/firefox-esr
+fi
+
 if $ROOTCMD update-alternatives --list www-browser 2>/dev/null | grep -q '/w3m' ; then
   echo "Setting w3m as www-browser using update-alternatives."
   $ROOTCMD update-alternatives --set www-browser /usr/bin/w3m