rename some variables

1 files changed, 16 insertions, 12 deletions

diff --git a/src/xorriso-usb.sh b/src/xorriso-usb.sh
index 04193e0..5546be0 100644..100755
--- a/src/xorriso-usb.sh
+++ b/src/xorriso-usb.sh
@@ -66,10 +66,10 @@ generate_keys()
 {
     if [ "$ADAM" -o "$BOOTLOADER_ONLY" ]; then
         kiki init || die 'kiki init failed'
-        gnupghome=/root/.gnupg
+        GPG_INPUT_DIR=/root/.gnupg
     else
         keygen.sh "$child_dir" || die "keygen.sh failed"
-        gnupghome=$child_dir/root/.gnupg
+        GPG_INPUT_DIR=$child_dir/root/.gnupg
         trap 'umount "$child_dir"; rmdir "$child_dir"' EXIT
     fi
 }
@@ -107,9 +107,9 @@ xorriso_cmd()
     ## that specify sources of input:
 
     # INPUT_DEVICE
-    # gnupghome
+    # GPG_INPUT_DIR
     # $@ (btrfs filesystems)
-    # INPUT_DEVICE_COPIES
+    # EXTRA_INPUT_DIRS
 
     ## boolean flags
 
@@ -127,7 +127,7 @@ xorriso_cmd()
             -pathspecs on \
             \
             \
-            ${INPUT_DEVICE_COPIES} \
+            ${EXTRA_INPUT_DIRS} \
             \
             \
             -rm_r linux -- -add linux="${vmlinuz_dir}" -- \
@@ -136,7 +136,7 @@ xorriso_cmd()
             \
             \
             -rm_r "${gpg_iso_path}" -- \
-            -add "${gpg_iso_path}=${gnupghome}" -- \
+            -add "${gpg_iso_path}=${GPG_INPUT_DIR}" -- \
             \
             \
             -chown_r 0 / -- \
@@ -173,6 +173,10 @@ find_child()
 
 . samizdat-paths.sh || die 'samizdat-path.sh not found'
 
+if [ -f xorriso-usb.config ]; then
+    . xorriso-usb.config
+fi
+
 volid=SamizdatLive
 vmlinuz_dir=$samizdat_linux_dir
 efi_dir=$samizdat_grub_efi_dir
@@ -180,7 +184,7 @@ gpg_iso_path=gnupghome
 
 
 outdev=
-gnupghome=
+GPG_INPUT_DIR=
 child_dir=$samizdat_child_dir/child.$$
 
 eval set -- "$(getopt -o '' --long bootloader,reuse-child:,adam,usb,detach,in:,out:,test -n "$0" -- "$@")" ||
@@ -238,8 +242,8 @@ grub-efi.sh || die "grub-efi.sh failed"
 choose_outdev
 
 if [ "$REUSE_CHILD" ]; then
-    gnupghome=$child_dir/root/.gnupg
-    [ -d "$gnupghome" ] || die "invalid child"
+    GPG_INPUT_DIR=$child_dir/root/.gnupg
+    [ -d "$GPG_INPUT_DIR" ] || die "invalid child"
 else
     generate_keys
 fi
@@ -247,12 +251,12 @@ fi
 if [ "$INPUT_DEVICE" ]; then
     if [ "$INPUT_DEVICE" = /dev/md55 ]; then
         if mountpoint -q /cdrom; then
-            INPUT_DEVICE_COPIES='-add /=/cdrom --'
+            EXTRA_INPUT_DIRS='-add /=/cdrom --'
         fi
     elif [ -d "$INPUT_DEVICE" ]; then
-        INPUT_DEVICE_COPIES="-add /=$INPUT_DEVICE --" # TODO: escape
+        EXTRA_INPUT_DIRS="-add /=$INPUT_DEVICE --" # TODO: escape
     elif try_mount "$INPUT_DEVICE"; then
-        INPUT_DEVICE_COPIES='-add /=/mnt --'
+        EXTRA_INPUT_DIRS='-add /=/mnt --'
     else
         REPLACE_INITRD=
         REMOVE_BTRFS=