ndwarshuis
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX make emacs parser more accurate

This commit is contained in:
Nathan Dwarshuis 2021-03-13 20:45:47 -05:00
parent 21e7d6b6ab
commit ca0ac5b5df
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dot_bin/executable_bootstrap_pkgs
View File

@ -56,12 +56,6 @@ call_makepkg() {
sudo -u nobody MAKEFLAGS="-j$(nproc)" makepkg -s -r -i -f --noconfirm sudo -u nobody MAKEFLAGS="-j$(nproc)" makepkg -s -r -i -f --noconfirm
} }
get_emacs_packages() {
emacs -batch -l "$emacs_dir/init.el" --eval \
"(print (s-join \" \" $1))" 2>/dev/null | \
sed -n -e 's/"\(.*\)"/\1/p'
}
run_yay() { run_yay() {
## TODO add template switches to control which of these get installed based ## TODO add template switches to control which of these get installed based
## on my config ## on my config
@ -69,7 +63,10 @@ run_yay() {
## packages for emacs (install emacs first to read the config) ## packages for emacs (install emacs first to read the config)
pacman --needed -S emacs pacman --needed -S emacs
IFS=' ' read -r -a emacs_pkgs \ IFS=' ' read -r -a emacs_pkgs \
< <(get_emacs_packages "(nd/get-aur-dependencies t)") < <(emacs -batch -l "$emacs_dir/init.el" --eval \
'(print (format "phgs: %s" (s-join " " (nd/get-aur-dependencies t))))' \
2>/dev/null \
sed -n -e 's/"pkgs: \(.*\)"/\1/p')
echo "Emacs requires the following system pkgs: ${emacs_pkgs[*]}" echo "Emacs requires the following system pkgs: ${emacs_pkgs[*]}"
## other packages for random gizmos ## other packages for random gizmos

5
run_once_after_10_install-packages.sh
View File

@ -52,8 +52,9 @@ sudo "$HOME/.bin/bootstrap_pkgs" "$HOME/.local/share/packages" "$emacs_dir"
IFS=' ' read -r -a emacs_stack_pkgs \ IFS=' ' read -r -a emacs_stack_pkgs \
< <(emacs -batch -l "$emacs_dir/init.el" --eval \ < <(emacs -batch -l "$emacs_dir/init.el" --eval \
"(print (s-join \" \" (nd/get-stack-dependencies)))" 2>/dev/null | \ '(print (format "phgs: %s" (s-join " " (nd/get-stack-dependencies))))' \
sed -n -e 's/"\(.*\)"/\1/p') 2>/dev/null | \
sed -n -e 's/"pkgs: \(.*\)"/\1/p')
echo "Emacs requires the following Haskell packages: ${emacs_stack_pkgs[*]}" echo "Emacs requires the following Haskell packages: ${emacs_stack_pkgs[*]}"
for p in "${emacs_stack_pkgs[@]}"; for p in "${emacs_stack_pkgs[@]}";
do do