From 1f289b75719de3c1be4c63878b67876c0b4c2acf Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Wed, 12 Jun 2019 19:47:58 -0400
Subject: [PATCH] more renaming and port copy-files to fish

---
 .../cargo_config => build-system/cargo.toml         |  0
 {build_system => build-system}/makepkg.conf         |  0
 copy-files.sh => copy-files.fish                    | 13 ++++++-------
 files                                               | 10 +++++-----
 mpd/{ncmpcpp_bind => ncmpcpp-bind}                  |  0
 mpd/{ncmpcpp_conf => ncmpcpp-conf}                  |  0
 scripts/{bookmark_get.ps1 => bookmark-get.ps1}      |  0
 7 files changed, 11 insertions(+), 12 deletions(-)
 rename build_system/cargo_config => build-system/cargo.toml (100%)
 rename {build_system => build-system}/makepkg.conf (100%)
 rename copy-files.sh => copy-files.fish (56%)
 rename mpd/{ncmpcpp_bind => ncmpcpp-bind} (100%)
 rename mpd/{ncmpcpp_conf => ncmpcpp-conf} (100%)
 rename scripts/{bookmark_get.ps1 => bookmark-get.ps1} (100%)

diff --git a/build_system/cargo_config b/build-system/cargo.toml
similarity index 100%
rename from build_system/cargo_config
rename to build-system/cargo.toml
diff --git a/build_system/makepkg.conf b/build-system/makepkg.conf
similarity index 100%
rename from build_system/makepkg.conf
rename to build-system/makepkg.conf
diff --git a/copy-files.sh b/copy-files.fish
similarity index 56%
rename from copy-files.sh
rename to copy-files.fish
index 9869299..783e590 100755
--- a/copy-files.sh
+++ b/copy-files.fish
@@ -1,14 +1,13 @@
-#!/usr/bin/env bash
+#!/usr/bin/env fish
 
-mkdir -p build_system mpd network scripts terminal themes vim x11
+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
+while read f t
+   eval set t $t
+   cp (find $t) $f
+end < 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/files b/files
index 2961716..e90e378 100644
--- a/files
+++ b/files
@@ -1,15 +1,15 @@
-build_system/cargo_config   ~/.cargo/config
-build_system/makepkg.conf   ~/.config/pacman/makepkg.conf
+build-system/cargo.toml     ~/.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
+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
+scripts/bookmark-get.ps1    /mnt/d/w2/Output/_dlscr/bookmark_get.ps1
 terminal/kitty.conf         ~/.config/kitty/kitty.conf
 terminal/fish               ~/.config/fish/config.fish
 themes                      ~/.slade3/text_styles/*
diff --git a/mpd/ncmpcpp_bind b/mpd/ncmpcpp-bind
similarity index 100%
rename from mpd/ncmpcpp_bind
rename to mpd/ncmpcpp-bind
diff --git a/mpd/ncmpcpp_conf b/mpd/ncmpcpp-conf
similarity index 100%
rename from mpd/ncmpcpp_conf
rename to mpd/ncmpcpp-conf
diff --git a/scripts/bookmark_get.ps1 b/scripts/bookmark-get.ps1
similarity index 100%
rename from scripts/bookmark_get.ps1
rename to scripts/bookmark-get.ps1