浏览代码

No longer need to explicitly use emacs version

Bob Mottram 7 年前
父节点
当前提交
ea091488b6
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 3
    3
      src/freedombone-app-emacs
  2. 1
    1
      src/freedombone-image-customise

+ 3
- 3
src/freedombone-app-emacs 查看文件

133
 }
133
 }
134
 
134
 
135
 function remove_emacs {
135
 function remove_emacs {
136
-    apt-get -yq remove --purge emacs24
136
+    apt-get -yq remove --purge emacs
137
     update-alternatives --set editor /usr/bin/nano
137
     update-alternatives --set editor /usr/bin/nano
138
     sed -i '/install_emacs/d' $COMPLETION_FILE
138
     sed -i '/install_emacs/d' $COMPLETION_FILE
139
 
139
 
156
 }
156
 }
157
 
157
 
158
 function install_emacs {
158
 function install_emacs {
159
-    apt-get -yq install emacs24
160
-    update-alternatives --set editor /usr/bin/emacs24
159
+    apt-get -yq install emacs
160
+    update-alternatives --set editor /usr/bin/emacs
161
 
161
 
162
     # A minimal emacs configuration
162
     # A minimal emacs configuration
163
     #echo -n "(add-to-list 'load-path " > /home/$MY_USERNAME/.emacs
163
     #echo -n "(add-to-list 'load-path " > /home/$MY_USERNAME/.emacs

+ 1
- 1
src/freedombone-image-customise 查看文件

766
     chroot "$rootdir" apt-get -yq install libtheora-bin libvorbis-dev v4l-utils
766
     chroot "$rootdir" apt-get -yq install libtheora-bin libvorbis-dev v4l-utils
767
 
767
 
768
     # a sane editor
768
     # a sane editor
769
-    chroot "$rootdir" apt-get -yq install emacs24
769
+    chroot "$rootdir" apt-get -yq install emacs
770
 
770
 
771
     # for wifi monitoring
771
     # for wifi monitoring
772
     chroot "$rootdir" apt-get -yq install horst
772
     chroot "$rootdir" apt-get -yq install horst