Merge branch 'cherry-pick-1a65f794' into 'master'

update install script

See merge request fschl/dotfiles!1
This commit is contained in:
fschl 2019-01-07 09:30:01 +00:00
commit 42515e757a
1 changed files with 7 additions and 6 deletions

View File

@ -67,7 +67,6 @@ base_applications() {
gcc \ gcc \
git \ git \
gnupg \ gnupg \
gnupg \
gnupg-agent \ gnupg-agent \
gnupg2 \ gnupg2 \
grep \ grep \
@ -211,10 +210,11 @@ install_i3() {
apt autoclean apt autoclean
apt clean apt clean
git clone https://github.com/syl20bnr/spacemacs ~/.emacs.d TARGET="/home/$USERNAME/.emacs.d"
rm -rf ~/.emacs.d/private/snippets git clone https://github.com/syl20bnr/spacemacs "${TARGET}"
git clone https://github.com/AndreaCrotti/yasnippet-snippets ~/.emacs.d/private/yas-snips rm -rf "${TARGET}"/private/snippets
ln -s ~/.emacs.d/private/yas-snips/snippets ~/emacs.d/private/snippets/ git clone https://github.com/AndreaCrotti/yasnippet-snippets "${TARGET}"/private/yas-snips
ln -s "${TARGET}"/private/yas-snips/snippets "${TARGET}"/private/snippets/
no_suspend no_suspend
@ -424,7 +424,7 @@ main() {
case "$cmd" in case "$cmd" in
base) base)
apt_sources buster apt_sources buster
base_applications base_applications
install_docker install_docker
install_compose install_compose
@ -436,6 +436,7 @@ main() {
install_server_base install_server_base
;; ;;
desktop) desktop)
apt_sources buster
install_i3 install_i3
apt_sources buster apt_sources buster
if [ -f "./get_private_stuff.sh" ]; then if [ -f "./get_private_stuff.sh" ]; then