From 4d4edd5e9d6198b3ee96fe9dc96654e26d32d1a7 Mon Sep 17 00:00:00 2001
From: Dan Church <amphetamachine@gmail.com>
Date: Thu, 29 Jun 2023 12:59:27 -0500
Subject: [PATCH] Move library code to lib/

Fixes accidental inclusion of test instrumentation into the all-in-one
script.
---
 {Directory => lib/Directory}/Simplify/File.pm                   | 0
 {Directory => lib/Directory}/Simplify/FileHash.pm               | 0
 .../Directory}/Simplify/Instruction/CopyTimestamp.pm            | 0
 {Directory => lib/Directory}/Simplify/Instruction/Generator.pm  | 0
 {Directory => lib/Directory}/Simplify/Instruction/Hardlink.pm   | 0
 {Directory => lib/Directory}/Simplify/Utils.pm                  | 0
 make-allinone.sh                                                | 2 +-
 simplify_static_dir-main.pl                                     | 2 +-
 8 files changed, 2 insertions(+), 2 deletions(-)
 rename {Directory => lib/Directory}/Simplify/File.pm (100%)
 rename {Directory => lib/Directory}/Simplify/FileHash.pm (100%)
 rename {Directory => lib/Directory}/Simplify/Instruction/CopyTimestamp.pm (100%)
 rename {Directory => lib/Directory}/Simplify/Instruction/Generator.pm (100%)
 rename {Directory => lib/Directory}/Simplify/Instruction/Hardlink.pm (100%)
 rename {Directory => lib/Directory}/Simplify/Utils.pm (100%)

diff --git a/Directory/Simplify/File.pm b/lib/Directory/Simplify/File.pm
similarity index 100%
rename from Directory/Simplify/File.pm
rename to lib/Directory/Simplify/File.pm
diff --git a/Directory/Simplify/FileHash.pm b/lib/Directory/Simplify/FileHash.pm
similarity index 100%
rename from Directory/Simplify/FileHash.pm
rename to lib/Directory/Simplify/FileHash.pm
diff --git a/Directory/Simplify/Instruction/CopyTimestamp.pm b/lib/Directory/Simplify/Instruction/CopyTimestamp.pm
similarity index 100%
rename from Directory/Simplify/Instruction/CopyTimestamp.pm
rename to lib/Directory/Simplify/Instruction/CopyTimestamp.pm
diff --git a/Directory/Simplify/Instruction/Generator.pm b/lib/Directory/Simplify/Instruction/Generator.pm
similarity index 100%
rename from Directory/Simplify/Instruction/Generator.pm
rename to lib/Directory/Simplify/Instruction/Generator.pm
diff --git a/Directory/Simplify/Instruction/Hardlink.pm b/lib/Directory/Simplify/Instruction/Hardlink.pm
similarity index 100%
rename from Directory/Simplify/Instruction/Hardlink.pm
rename to lib/Directory/Simplify/Instruction/Hardlink.pm
diff --git a/Directory/Simplify/Utils.pm b/lib/Directory/Simplify/Utils.pm
similarity index 100%
rename from Directory/Simplify/Utils.pm
rename to lib/Directory/Simplify/Utils.pm
diff --git a/make-allinone.sh b/make-allinone.sh
index 5f201d9..6bbaa4d 100755
--- a/make-allinone.sh
+++ b/make-allinone.sh
@@ -8,6 +8,6 @@ echo "Outputting to $OUT" >&2
 shopt -s globstar
 "$WORKDIR/util/squash" \
     "$WORKDIR/simplify_static_dir-main.pl" \
-    "$WORKDIR"/**/*.pm \
+    "$WORKDIR"/lib/**/*.pm \
     > "$OUT"
 chmod +x -- "$OUT"
diff --git a/simplify_static_dir-main.pl b/simplify_static_dir-main.pl
index 6e1522d..78ecfe4 100755
--- a/simplify_static_dir-main.pl
+++ b/simplify_static_dir-main.pl
@@ -107,7 +107,7 @@ use Pod::Usage qw/ pod2usage /;
 # :squash-remove-start:
 # (this prepends to the load path)
 use FindBin qw//;
-use lib $FindBin::RealBin;
+use lib "$FindBin::RealBin/lib";
 
 require Directory::Simplify::File;
 require Directory::Simplify::FileHash;