reorganize filesv2.1.0

11 files changed, 28 insertions, 28 deletions

diff --git a/.gitattributes b/.gitattributes
index 78efe19..2aef5b2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,7 +2,7 @@
 
 *.sh text eol=lf
 
-/links-* text eol=lf
+/bin/links-* text eol=lf
 
 /.github/      export-ignore
 .gitattributes export-ignore
diff --git a/links-chmod b/bin/links-chmod
index 167cb8e..931a5b5 100755
--- a/links-chmod
+++ b/bin/links-chmod
@@ -17,14 +17,14 @@ script_path="$( readlink --canonicalize-existing -- "${BASH_SOURCE[0]}" )"
 readonly script_path
 script_dir="$( dirname -- "$script_path" )"
 readonly script_dir
-src_dir="$( cd -- "$script_dir/src" && pwd )"
-readonly src_dir
+lib_dir="$( cd -- "$script_dir/../lib" && pwd )"
+readonly lib_dir
 
-. "$src_dir/common.sh"
-. "$src_dir/os.sh"
-. "$src_dir/path.sh"
-. "$src_dir/vars.sh"
-. "$src_dir/db.sh"
+. "$lib_dir/common.sh"
+. "$lib_dir/os.sh"
+. "$lib_dir/path.sh"
+. "$lib_dir/vars.sh"
+. "$lib_dir/db.sh"
 
 script_usage() {
     local msg
diff --git a/links-remove b/bin/links-remove
index 2941509..a149e52 100755
--- a/links-remove
+++ b/bin/links-remove
@@ -17,14 +17,14 @@ script_path="$( readlink --canonicalize-existing -- "${BASH_SOURCE[0]}" )"
 readonly script_path
 script_dir="$( dirname -- "$script_path" )"
 readonly script_dir
-src_dir="$( cd -- "$script_dir/src" && pwd )"
-readonly src_dir
+lib_dir="$( cd -- "$script_dir/../lib" && pwd )"
+readonly lib_dir
 
-. "$src_dir/common.sh"
-. "$src_dir/os.sh"
-. "$src_dir/path.sh"
-. "$src_dir/vars.sh"
-. "$src_dir/db.sh"
+. "$lib_dir/common.sh"
+. "$lib_dir/os.sh"
+. "$lib_dir/path.sh"
+. "$lib_dir/vars.sh"
+. "$lib_dir/db.sh"
 
 script_usage() {
     local msg
diff --git a/links-update b/bin/links-update
index 68910a2..dac40ff 100755
--- a/links-update
+++ b/bin/links-update
@@ -17,14 +17,14 @@ script_path="$( readlink --canonicalize-existing -- "${BASH_SOURCE[0]}" )"
 readonly script_path
 script_dir="$( dirname -- "$script_path" )"
 readonly script_dir
-src_dir="$( cd -- "$script_dir/src" && pwd )"
-readonly src_dir
+lib_dir="$( cd -- "$script_dir/../lib" && pwd )"
+readonly lib_dir
 
-. "$src_dir/common.sh"
-. "$src_dir/os.sh"
-. "$src_dir/path.sh"
-. "$src_dir/vars.sh"
-. "$src_dir/db.sh"
+. "$lib_dir/common.sh"
+. "$lib_dir/os.sh"
+. "$lib_dir/path.sh"
+. "$lib_dir/vars.sh"
+. "$lib_dir/db.sh"
 
 script_usage() {
     local msg
diff --git a/src/common.sh b/lib/common.sh
index 51c9827..51c9827 100644
--- a/src/common.sh
+++ b/lib/common.sh
diff --git a/src/db.sh b/lib/db.sh
index ae96487..ae96487 100644
--- a/src/db.sh
+++ b/lib/db.sh
diff --git a/src/os.sh b/lib/os.sh
index 01d70f4..01d70f4 100644
--- a/src/os.sh
+++ b/lib/os.sh
diff --git a/src/path.sh b/lib/path.sh
index 4fcdb94..4fcdb94 100644
--- a/src/path.sh
+++ b/lib/path.sh
diff --git a/src/vars.sh b/lib/vars.sh
index 97b8da9..97b8da9 100644
--- a/src/vars.sh
+++ b/lib/vars.sh
diff --git a/test/linux-home/test.sh b/test/linux-home/test.sh
index edb2d5b..5021048 100755
--- a/test/linux-home/test.sh
+++ b/test/linux-home/test.sh
@@ -55,15 +55,15 @@ call_bin_script() {
 }
 
 call_update() {
-    call_bin_script "$root_dir/links-update" "$@"
+    call_bin_script "$root_dir/bin/links-update" "$@"
 }
 
 call_remove() {
-    call_bin_script "$root_dir/links-remove"
+    call_bin_script "$root_dir/bin/links-remove"
 }
 
 call_chmod() {
-    call_bin_script "$root_dir/links-chmod" "$@"
+    call_bin_script "$root_dir/bin/links-chmod" "$@"
 }
 
 test_my_dotfiles_work() {
diff --git a/test/local/test.sh b/test/local/test.sh
index 99b426f..1e8567f 100755
--- a/test/local/test.sh
+++ b/test/local/test.sh
@@ -66,15 +66,15 @@ call_bin_script() {
 }
 
 call_update() {
-    call_bin_script "$root_dir/links-update" "$@"
+    call_bin_script "$root_dir/bin/links-update" "$@"
 }
 
 call_remove() {
-    call_bin_script "$root_dir/links-remove"
+    call_bin_script "$root_dir/bin/links-remove"
 }
 
 call_chmod() {
-    call_bin_script "$root_dir/links-chmod" "$@"
+    call_bin_script "$root_dir/bin/links-chmod" "$@"
 }
 
 verify_output() {