|
@@ -30,8 +30,11 @@
|
30
|
30
|
|
31
|
31
|
VARIANTS='full-vim'
|
32
|
32
|
|
33
|
|
-vim_variables=(MY_USERNAME)
|
34
|
33
|
VIM_TEMP_DIR='.vimtemp'
|
|
34
|
+VIM_MUTT_EDITOR='vim \"+set nonumber\" \"+set insertmode\" \"+set spell\" +/^$/ +9'
|
|
35
|
+
|
|
36
|
+vim_variables=(MY_USERNAME
|
|
37
|
+ VIM_MUTT_EDITOR)
|
35
|
38
|
|
36
|
39
|
function change_password_vim {
|
37
|
40
|
echo -n ''
|
|
@@ -211,18 +214,18 @@ function install_vim {
|
211
|
214
|
# add a mutt entry to use Vim to compose emails
|
212
|
215
|
if [ -f /etc/Muttrc ]; then
|
213
|
216
|
if ! grep -q "set editor=" /etc/Muttrc; then
|
214
|
|
- echo 'set editor="vim"' >> /etc/Muttrc
|
|
217
|
+ echo "set editor=\"$VIM_MUTT_EDITOR\"" >> /etc/Muttrc
|
215
|
218
|
else
|
216
|
|
- sed -i 's|set editor=.*|set editor="vim"|g' /etc/Muttrc
|
|
219
|
+ sed -i "s|set editor=.*|set editor=\"$VIM_MUTT_EDITOR\"|g" /etc/Muttrc
|
217
|
220
|
fi
|
218
|
221
|
for d in /home/*/ ; do
|
219
|
222
|
USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
|
220
|
223
|
if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
|
221
|
224
|
if [ -f /home/$USERNAME/.muttrc ]; then
|
222
|
225
|
if ! grep -q "set editor=" /home/$USERNAME/.muttrc; then
|
223
|
|
- echo 'set editor="vim"' >> /home/$USERNAME/.muttrc
|
|
226
|
+ echo "set editor=\"$VIM_MUTT_EDITOR\"" >> /home/$USERNAME/.muttrc
|
224
|
227
|
else
|
225
|
|
- sed -i 's|set editor=.*|set editor="vim"|g' /home/$USERNAME/.muttrc
|
|
228
|
+ sed -i "s|set editor=.*|set editor=\"$VIM_MUTT_EDITOR\"|g" /home/$USERNAME/.muttrc
|
226
|
229
|
fi
|
227
|
230
|
fi
|
228
|
231
|
fi
|