slight cleanup/factor

1 files changed, 17 insertions, 26 deletions

diff --git a/initramfs-tools/hooks/samizdat b/initramfs-tools/hooks/samizdat
index 5b1971b..ac71947 100755
--- a/initramfs-tools/hooks/samizdat
+++ b/initramfs-tools/hooks/samizdat
@@ -1,55 +1,46 @@
 #!/bin/sh
+# TODO: check samizdat source to see what it copies
 [ "$1" = prereqs ] && { echo; exit; }
 
 CopyExec() { copy_exec "$@" || exit 1; }
 
 . /usr/share/initramfs-tools/hook-functions
 
-for f in ./old-school/* loop-layer.sh; do CopyExec "$f" /bin; done
+repo_execs=$(echo ./old-school/* loop-layer.sh)
 
-# TODO: check samizdat source to see what it copies
 path_execs='mountpoint openvt rsync gpg2 gpg-agent pinentry-curses truncate cryptsetup mkfs.btrfs btrfs fsck.hfsplus'
 
-for c in $path_execs; do CopyExec "$(which $c)" /bin; done
-
 graft_paths="
     /bin/OpenVT=/bin/openvt
     /bin/LoSetup=/sbin/losetup
     /patchroot/patchroot.sh=patchroot.sh
     /patchroot/sources.list=/etc/apt/sources.list
     /patchroot/initrd-dependencies.txt=initrd-dependencies.txt
+    /lib/samizdat/vol_id.txt=vol_id.txt
 "
 
-for e in $graft_paths; do
-    case "$e" in
-        *=*)
-            dest=${e%%=*}
-            src=${e#*=}
-            CopyExec "$src" "$dest"
-            ;;
-        *) exit 1 ;;
-    esac
-done
-
 absolute_path_copies='/lib/terminfo/l/linux'
 
-for f in $absolute_path_copies; do CopyExec "$f" "$f"; done
-
-samizdat_execs_dir=/home/d/src/samizdat # TODO
 samizdat_execs='wait_for_files samizdat-pinentry dynmenu src/samizdat-password-agent src/samizdat-gpg-agent'
+modules='loop xts dm-crypt hfs hfsplus'
+modules_dirs='kernel/drivers/net/ethernet kernel/fs/nls'
 
-for c in $samizdat_execs; do CopyExec ${samizdat_execs_dir}/$c /bin; done
 
-CopyExec vol_id.txt /lib/samizdat/vol_id.txt
 
-modules='loop xts dm-crypt hfs hfsplus'
-for m in $modules; do force_load "$m" || exit 1; done
 
-sex() { (set -x; "$@"); }
+for f in $repo_execs; do CopyExec "$f" /bin; done
+for c in $path_execs; do CopyExec "$(which $c)" /bin; done
+for f in $absolute_path_copies; do CopyExec "$f" "$f"; done
+samizdat_execs_dir=/home/d/src/samizdat # TODO
+for c in $samizdat_execs; do CopyExec ${samizdat_execs_dir}/$c /bin; done
+for m in $modules; do force_load "$m" || exit 1; done
+for dir in $modules_dirs; do copy_modules_dir "$dir" || exit 1; done
 
-modules_dirs='kernel/drivers/net/ethernet kernel/fs/nls'
-for dir in $modules_dirs; do
-    copy_modules_dir "$dir" || exit 1
+for e in $graft_paths; do
+    case "$e" in
+        *=*) CopyExec "${e#*=}" "${e%%=*}" ;;
+        *) exit 1 ;;
+    esac
 done
 
 exit 0