From 1fd44f47ae05855866e0998eb67dc7fa46ae3f89 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 11 Jun 2020 11:47:16 +0200 Subject: [PATCH] local/bin/homeinit: Remvoe EMACS_MIN_VERSION, use XDG_DATA_HOME. --- .local/bin/homeinit | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.local/bin/homeinit b/.local/bin/homeinit index 34b37f1e..c89a54eb 100755 --- a/.local/bin/homeinit +++ b/.local/bin/homeinit @@ -14,7 +14,6 @@ SUBSTITUTE_URLS=https://ci.guix.gnu.org [ -z "$SOURCEDIR" ] && SOURCEDIR="$HOME/personal" [ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config" [ -z "$XDG_DATA_HOME" ] && XDG_DATA_HOME="$HOME/.local/share" -[ -z "$EMACS_MIN_VERSION" ] && EMACS_MIN_VERSION=26 usage() { cat <&2 @@ -34,7 +33,6 @@ Environment variables: SOURCEDIR=$SOURCEDIR XDG_CONFIG_HOME=$XDG_CONFIG_HOME XDG_DATA_HOME=$XDG_DATA_HOME - EMACS_MIN_VERSION=$EMACS_MIN_VERSION Direct link: @@ -179,7 +177,7 @@ else fi section "Persistent folders" -for i in .cache/mail .config .config/guix .config/transmission-daemon .emacs.d .local/share .mpv projects; do +for i in .cache/mail .config .config/guix .config/transmission-daemon .emacs.d "$XDG_DATA_HOME" .mpv projects; do mkdir -pv "$HOME/$i" done @@ -325,13 +323,13 @@ if inpath emacs; then fi fi message "Emacs local packages" - if [ -e ~/.local/share/emacs/site-lisp ]; then - for i in ~/.local/share/emacs/site-lisp/*; do + if [ -e "$XDG_DATA_HOME"/emacs/site-lisp ]; then + for i in "$XDG_DATA_HOME"/emacs/site-lisp/*; do echo "$i" git -C "$i" pull done else - mkdir -pv ~/.local/share/emacs/site-lisp + mkdir -pv "$XDG_DATA_HOME"/emacs/site-lisp fi fi