From 472af288a768a69d4d5ab40fc1ac383e816bc315 Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Fri, 7 Jun 2019 16:37:33 -0400
Subject: [PATCH] change the way files are copied

---
 copy_files.sh   | 14 ++++++++++++++
 copy_scripts.sh | 33 ---------------------------------
 files           | 21 +++++++++++++++++++++
 3 files changed, 35 insertions(+), 33 deletions(-)
 create mode 100755 copy_files.sh
 delete mode 100755 copy_scripts.sh
 create mode 100644 files

diff --git a/copy_files.sh b/copy_files.sh
new file mode 100755
index 0000000..9869299
--- /dev/null
+++ b/copy_files.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+mkdir -p build_system mpd network scripts terminal themes vim x11
+
+tree -dL 3 ~/.vim/pack > vim/packages
+
+while read -r f t
+do
+   eval t=$t
+   cp $(find $t) $f
+done < files
+
+sed -i 's/password>.*<\//password>password removed<\//g' network/icecast.xml
+sed -i 's/password\(\s*\)".*"/password\1"password removed"/g' mpd/mpd.conf
diff --git a/copy_scripts.sh b/copy_scripts.sh
deleted file mode 100755
index 4a71716..0000000
--- a/copy_scripts.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-mkdir -p build_system mpd network scripts terminal themes vim x11
-
-tree -dL 3 ~/.vim/pack > vim/packages
-
-while read t f
-do
-   cp $(find $t) $f
-done <<END
-$HOME/.XCompose                              x11/XCompose
-$HOME/.Xresources                            x11/Xresources
-$HOME/.cargo/config                          build_system/cargo_config
-$HOME/.config/kitty/kitty.conf               terminal/kitty.conf
-$HOME/.config/mpd/mpd.conf                   mpd/mpd.conf
-$HOME/.config/pacman/makepkg.conf            build_system/makepkg.conf
-$HOME/.ncmpcpp/bindings                      mpd/ncmpcpp_bind
-$HOME/.ncmpcpp/config                        mpd/ncmpcpp_conf
-$HOME/.sharenix.json                         network/sharenix.json
-$HOME/.slade3/text_styles/*                  themes
-$HOME/.vimrc                                 vim/vimrc
-$HOME/.xprofile                              x11/xprofile
-$HOME/.zshrc                                 terminal/zshrc
-$HOME/src/scripts/*                          scripts
-/etc/X11/xorg.conf.d/61-xwiimote-custom.conf x11/61-xwiimote-custom.conf
-/etc/icecast.xml                             network/icecast.xml
-/etc/motsognir.conf                          network/motsognir.conf
-/etc/nginx/nginx.conf                        network/nginx.conf
-/etc/systemd/network/*                       network
-/mnt/d/w2/Output/_dlscr/bookmark_get.ps1     scripts/bookmark_get.ps1
-/usr/share/X11/xkb/symbols/progm             x11/progm.xkb
-END
-
-sed -i 's/password>.*<\//password>password removed<\//g' network/icecast.xml
-sed -i 's/password\(\s*\)".*"/password\1"password removed"/g' mpd/mpd.conf
diff --git a/files b/files
new file mode 100644
index 0000000..5bf8ab0
--- /dev/null
+++ b/files
@@ -0,0 +1,21 @@
+build_system/cargo_config   ~/.cargo/config
+build_system/makepkg.conf   ~/.config/pacman/makepkg.conf
+mpd/mpd.conf                ~/.config/mpd/mpd.conf
+mpd/ncmpcpp_bind            ~/.ncmpcpp/bindings
+mpd/ncmpcpp_conf            ~/.ncmpcpp/config
+network                     /etc/systemd/network/*
+network/icecast.xml         /etc/icecast.xml
+network/motsognir.conf      /etc/motsognir.conf
+network/nginx.conf          /etc/nginx/nginx.conf
+network/sharenix.json       ~/.sharenix.json
+scripts                     ~/src/scripts/*
+scripts/bookmark_get.ps1    /mnt/d/w2/Output/_dlscr/bookmark_get.ps1
+terminal/kitty.conf         ~/.config/kitty/kitty.conf
+terminal/zshrc              ~/.zshrc
+themes                      ~/.slade3/text_styles/*
+vim/vimrc                   ~/.vimrc
+x11/61-xwiimote-custom.conf /etc/X11/xorg.conf.d/61-xwiimote-custom.conf
+x11/XCompose                ~/.XCompose
+x11/Xresources              ~/.Xresources
+x11/progm.xkb               /usr/share/X11/xkb/symbols/progm
+x11/xprofile                ~/.xprofile