path independence achieved?

4 files changed, 16 insertions, 11 deletions

diff --git a/src/initrd.sh b/src/initrd.sh
index 0bc1ed7..5c3013a 100755
--- a/src/initrd.sh
+++ b/src/initrd.sh
@@ -2,8 +2,8 @@
 
 . samizdat-paths.sh
 
-initrd=${samizdat_isolinux_dir}/linux/initrd.img
-vmlinuz=${samizdat_isolinux_dir}/linux/vmlinuz
+initrd=${samizdat_linux_dir}/initrd.img
+vmlinuz=${samizdat_linux_dir}/vmlinuz
 
 version=$(uname -r)
 version=4.5.0-0.bpo.1-amd64
diff --git a/src/keygen.sh b/src/keygen.sh
index 801010a..f952cec 100755
--- a/src/keygen.sh
+++ b/src/keygen.sh
@@ -2,7 +2,7 @@
 
 gpg_set_ultimate_trust()
 {
-          local keygrip d
+          local keygrip
     keygrip=$(gpg  -K --with-colons --with-fingerprint --with-fingerprint|sed -ne '/^sec/{n;p;q}'|cut -d: -f10)
     printf '%s:6:\n' "$keygrip" | gpg2 --import-ownertrust
 }
diff --git a/src/samizdat-paths.sh b/src/samizdat-paths.sh
index 94c4312..fc6468d 100644
--- a/src/samizdat-paths.sh
+++ b/src/samizdat-paths.sh
@@ -1,8 +1,13 @@
-samizdat_initrd_files_dir=/home/d/sami/src/initrd
+# Note: this file is both shell script and make file
+samizdat_libdir=/usr/local/lib/samizdat-rhizome
+samizdat_bindir=/usr/local/bin
+
+  samizdat_initrd_files_dir=${samizdat_libdir}/initrd
+         samizdat_child_dir=${samizdat_libdir}/child
+      samizdat_isolinux_dir=${samizdat_libdir}/isolinux
+         samizdat_linux_dir=${samizdat_libdir}/isolinux/linux
+      samizdat_grub_efi_dir=${samizdat_libdir}/grub-efi
+samizdat_initramfs_conf_dir=${samizdat_libdir}/initramfs-tools
+
+samizdat_iso_dir=.
 samizdat_execs_dir=/home/d/src/samizdat
-samizdat_child_dir=/home/d/sami/child
-samizdat_isolinux_dir=/home/d/sami/isolinux
-samizdat_grub_efi_dir=/home/d/sami/grub-efi
-samizdat_iso_dir=/home/d/sami
-samizdat_initramfs_conf_dir=/home/d/sami/initramfs-tools
-PATH=/usr/local/samizdat/bin:${PATH}
diff --git a/src/xorriso-usb.sh b/src/xorriso-usb.sh
index 7ff9825..01fd436 100644
--- a/src/xorriso-usb.sh
+++ b/src/xorriso-usb.sh
@@ -6,7 +6,7 @@ outdev=
 volid=SamizdatLive
 gpg_iso_path=gnupghome
 gnupghome=
-child_dir=$samizdat_child_dir
+child_dir=$samizdat_child_dir/child.$$
 vmlinuz_dir=$samizdat_isolinux_dir
 efi_dir=$samizdat_grub_efi_dir