uncommited

arch-user/install.sh

@@ -8,7 +8,6 @@ set -e
 cd "$(dirname "$(readlink -f -- "$0")")"
 umask 002
 [[ "$(id -u)" == "0" ]] && echo "ERROR: wrong user" >&1 && exit 1
-export IS_COMPAT=0
 
 ########## init config #########
 if [[ ! -f ~/.config/workspace.conf ]]; then
@@ -49,7 +48,7 @@ mkdir -p "${USER_DIRS[@]}"
 ########## scripts #############
 cp -rf bin/* ~/.local/bin
 
-LN_EXCLUDE_DIRS=(i3blocks bemenu sway workspace-compat)
+LN_EXCLUDE_DIRS=(i3blocks bemenu sway)
 
 ln_exclude_dirs_cmp=" ${LN_EXCLUDE_DIRS[*]} "
 for sdir in bin/*; do
@@ -65,13 +64,14 @@ done
 ################################
 
 ########### config #############
+export IS_COMPAT=0
 gomplate --input-dir config \
 	--output-map "$HOME/.config/{{ .in | strings.ReplaceAll \".tmpl\" \"\" }}" \
 	--exclude-processing "!*.tmpl" \
 	--plugin jq=/bin/jq \
 	-c theme=config/theme.json \
 	-c user="file:///$HOME/.config/workspace.conf?type=application/x-env" \
-	--exclude /workspace.conf
+	--exclude /workspace.conf --exclude /workspace-compat/profile.tmpl
 
 ln -sf ~/.config/bash/bashrc ~/.bashrc
 ln -sf ~/.config/profile ~/.profile
@@ -85,12 +85,12 @@ cp -rf data/* ~/.local/share
 
 ########### compat ############
 export IS_COMPAT=1
-gomplate --file bin/workspace-compat/profile.tmpl \
+gomplate --file config/workspace-compat/profile.tmpl \
 	-t vimrc=config/vim/vimrc \
 	-t inputrc=config/readline/inputrc \
 	-t lesskey=config/less/lesskey \
 	-t wssh=bin/wssh \
-	--out ~/.local/bin/workspace-compat/profile
+	--out ~/.config/workspace-compat/profile
 export IS_COMPAT=0
 ###############################